@strapi/core 0.0.0-experimental.fc1ac2acd58c8a5a858679956b6d102ac5ee4011 → 0.0.0-experimental.fca58d9b01ba89012d84a58a20556a6fd716cb92

package/dist/loaders/apis.js

@@ -1,137 +1,160 @@
-"use strict";
-const path = require("path");
-const fse = require("fs-extra");
-const _ = require("lodash");
-const strapiUtils = require("@strapi/utils");
-const _$1 = require("lodash/fp");
-const index = require("../domain/content-type/index.js");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const fse__default = /* @__PURE__ */ _interopDefault(fse);
-const ___default = /* @__PURE__ */ _interopDefault(_);
+'use strict';
+
+var path = require('path');
+var fse = require('fs-extra');
+var _ = require('lodash');
+var strapiUtils = require('@strapi/utils');
+var fp = require('lodash/fp');
+var index = require('../domain/content-type/index.js');
+
 const DEFAULT_CONTENT_TYPE = {
-  schema: {},
-  actions: {},
-  lifecycles: {}
+    schema: {},
+    actions: {},
+    lifecycles: {}
 };
-const normalizeName = (name) => strapiUtils.strings.isKebabCase(name) ? name : ___default.default.kebabCase(name);
-const isDirectory = (fd) => fd.isDirectory();
-const isDotFile = (fd) => fd.name.startsWith(".");
+// to handle names with numbers in it we first check if it is already in kebabCase
+const normalizeName = (name)=>strapiUtils.strings.isKebabCase(name) ? name : _.kebabCase(name);
+const isDirectory = (fd)=>fd.isDirectory();
+const isDotFile = (fd)=>fd.name.startsWith('.');
 async function loadAPIs(strapi) {
-  if (!fse.existsSync(strapi.dirs.dist.api)) {
-    return;
-  }
-  const apisFDs = await (await fse__default.default.readdir(strapi.dirs.dist.api, { withFileTypes: true })).filter(isDirectory).filter(___default.default.negate(isDotFile));
-  const apis = {};
-  for (const apiFD of apisFDs) {
-    const apiName = normalizeName(apiFD.name);
-    const api = await loadAPI(apiName, path.join(strapi.dirs.dist.api, apiFD.name));
-    apis[apiName] = api;
-  }
-  validateContentTypesUnicity(apis);
-  for (const apiName of Object.keys(apis)) {
-    strapi.get("apis").add(apiName, apis[apiName]);
-  }
-}
-const validateContentTypesUnicity = (apis) => {
-  const allApisSchemas = Object.values(apis).flatMap((api) => Object.values(api.contentTypes));
-  const names = [];
-  allApisSchemas.forEach(({ schema }) => {
-    if (schema.info.singularName) {
-      const singularName = ___default.default.kebabCase(schema.info.singularName);
-      if (names.includes(singularName)) {
-        throw new Error(`The singular name "${schema.info.singularName}" should be unique`);
-      }
-      names.push(singularName);
+    if (!fse.existsSync(strapi.dirs.dist.api)) {
+        return;
+    }
+    const apisFDs = await (await fse.readdir(strapi.dirs.dist.api, {
+        withFileTypes: true
+    })).filter(isDirectory).filter(_.negate(isDotFile));
+    const apis = {};
+    // only load folders
+    for (const apiFD of apisFDs){
+        const apiName = normalizeName(apiFD.name);
+        const api = await loadAPI(apiName, path.join(strapi.dirs.dist.api, apiFD.name));
+        // @ts-expect-error TODO verify that it's a valid api, not missing bootstrap, register, and destroy
+        apis[apiName] = api;
     }
-    if (schema.info.pluralName) {
-      const pluralName = ___default.default.kebabCase(schema.info.pluralName);
-      if (names.includes(pluralName)) {
-        throw new Error(`The plural name "${schema.info.pluralName}" should be unique`);
-      }
-      names.push(pluralName);
+    validateContentTypesUnicity(apis);
+    for (const apiName of Object.keys(apis)){
+        strapi.get('apis').add(apiName, apis[apiName]);
     }
-  });
+}
+const validateContentTypesUnicity = (apis)=>{
+    const allApisSchemas = Object.values(apis).flatMap((api)=>Object.values(api.contentTypes));
+    const names = [];
+    allApisSchemas.forEach(({ schema })=>{
+        if (schema.info.singularName) {
+            const singularName = _.kebabCase(schema.info.singularName);
+            if (names.includes(singularName)) {
+                throw new Error(`The singular name "${schema.info.singularName}" should be unique`);
+            }
+            names.push(singularName);
+        }
+        if (schema.info.pluralName) {
+            const pluralName = _.kebabCase(schema.info.pluralName);
+            if (names.includes(pluralName)) {
+                throw new Error(`The plural name "${schema.info.pluralName}" should be unique`);
+            }
+            names.push(pluralName);
+        }
+    });
 };
-const loadAPI = async (apiName, dir) => {
-  const [index2, config, routes, controllers, services, policies, middlewares, contentTypes] = await Promise.all([
-    loadIndex(dir),
-    loadDir(path.join(dir, "config")),
-    loadDir(path.join(dir, "routes")),
-    loadDir(path.join(dir, "controllers")),
-    loadDir(path.join(dir, "services")),
-    loadDir(path.join(dir, "policies")),
-    loadDir(path.join(dir, "middlewares")),
-    loadContentTypes(apiName, path.join(dir, "content-types"))
-  ]);
-  return {
-    ...index2 || {},
-    config: config || {},
-    routes: routes || [],
-    controllers: controllers || {},
-    services: services || {},
-    policies: policies || {},
-    middlewares: middlewares || {},
-    contentTypes: contentTypes || {}
-  };
+const loadAPI = async (apiName, dir)=>{
+    const [index, config, routes, controllers, services, policies, middlewares, contentTypes] = (await Promise.all([
+        loadIndex(dir),
+        loadDir(path.join(dir, 'config')),
+        loadDir(path.join(dir, 'routes')),
+        loadDir(path.join(dir, 'controllers')),
+        loadDir(path.join(dir, 'services')),
+        loadDir(path.join(dir, 'policies')),
+        loadDir(path.join(dir, 'middlewares')),
+        loadContentTypes(apiName, path.join(dir, 'content-types'))
+    ])).map((result)=>result?.result);
+    return {
+        ...index || {},
+        config: config || {},
+        routes: routes || [],
+        controllers: controllers || {},
+        services: services || {},
+        policies: policies || {},
+        middlewares: middlewares || {},
+        contentTypes: contentTypes || {}
+    };
 };
-const loadIndex = async (dir) => {
-  if (await fse__default.default.pathExists(path.join(dir, "index.js"))) {
-    return loadFile(path.join(dir, "index.js"));
-  }
+const loadIndex = async (dir)=>{
+    if (await fse.pathExists(path.join(dir, 'index.js'))) {
+        return loadFile(path.join(dir, 'index.js'));
+    }
 };
-const loadContentTypes = async (apiName, dir) => {
-  if (!await fse__default.default.pathExists(dir)) {
-    return;
-  }
-  const fds = await fse__default.default.readdir(dir, { withFileTypes: true });
-  const contentTypes = {};
-  for (const fd of fds) {
-    if (fd.isFile()) {
-      continue;
+// because this is async and its contents are dynamic, we must return it within an object to avoid a property called `then` being interpreted as a Promise
+const loadContentTypes = async (apiName, dir)=>{
+    if (!await fse.pathExists(dir)) {
+        return;
     }
-    const contentTypeName = normalizeName(fd.name);
-    const loadedContentType = await loadDir(path.join(dir, fd.name));
-    if (_$1.isEmpty(loadedContentType) || _$1.isEmpty(loadedContentType.schema)) {
-      throw new Error(`Could not load content type found at ${dir}`);
+    const fds = await fse.readdir(dir, {
+        withFileTypes: true
+    });
+    const contentTypes = {};
+    // only load folders
+    for (const fd of fds){
+        if (fd.isFile()) {
+            continue;
+        }
+        const contentTypeName = normalizeName(fd.name);
+        const loadedContentType = (await loadDir(path.join(dir, fd.name)))?.result;
+        if (fp.isEmpty(loadedContentType) || fp.isEmpty(loadedContentType.schema)) {
+            throw new Error(`Could not load content type found at ${dir}`);
+        }
+        const contentType = {
+            ...DEFAULT_CONTENT_TYPE,
+            ...loadedContentType
+        };
+        Object.assign(contentType.schema, {
+            apiName,
+            collectionName: contentType.schema.collectionName || contentType.schema.info.singularName,
+            globalId: index.getGlobalId(contentType.schema)
+        });
+        contentTypes[normalizeName(contentTypeName)] = contentType;
     }
-    const contentType = {
-      ...DEFAULT_CONTENT_TYPE,
-      ...loadedContentType
+    return {
+        result: contentTypes
     };
-    Object.assign(contentType.schema, {
-      apiName,
-      collectionName: contentType.schema.collectionName || contentType.schema.info.singularName,
-      globalId: index.getGlobalId(contentType.schema)
-    });
-    contentTypes[normalizeName(contentTypeName)] = contentType;
-  }
-  return contentTypes;
 };
-const loadDir = async (dir) => {
-  if (!await fse__default.default.pathExists(dir)) {
-    return;
-  }
-  const fds = await fse__default.default.readdir(dir, { withFileTypes: true });
-  const root = {};
-  for (const fd of fds) {
-    if (!fd.isFile() || path.extname(fd.name) === ".map") {
-      continue;
+// because this is async and its contents are dynamic, we must return it within an object to avoid a property called `then` being interpreted as a Promise
+const loadDir = async (dir)=>{
+    if (!await fse.pathExists(dir)) {
+        return;
+    }
+    const fds = await fse.readdir(dir, {
+        withFileTypes: true
+    });
+    const root = {};
+    for (const fd of fds){
+        if (!fd.isFile() || path.extname(fd.name) === '.map') {
+            continue;
+        }
+        const key = path.basename(fd.name, path.extname(fd.name));
+        root[normalizeName(key)] = (await loadFile(path.join(dir, fd.name))).result;
     }
-    const key = path.basename(fd.name, path.extname(fd.name));
-    root[normalizeName(key)] = await loadFile(path.join(dir, fd.name));
-  }
-  return root;
+    return {
+        result: root
+    };
 };
-const loadFile = (file) => {
-  const ext = path.extname(file);
-  switch (ext) {
-    case ".js":
-      return strapiUtils.importDefault(file);
-    case ".json":
-      return fse__default.default.readJSON(file);
-    default:
-      return {};
-  }
+// because this is async and its contents are dynamic, we must return it as an array to avoid a property called `then` being interpreted as a Promise
+const loadFile = async (file)=>{
+    const ext = path.extname(file);
+    switch(ext){
+        case '.js':
+            return {
+                result: strapiUtils.importDefault(file)
+            };
+        case '.json':
+            return {
+                result: await fse.readJSON(file)
+            };
+        default:
+            return {
+                result: {}
+            };
+    }
 };
+
 module.exports = loadAPIs;
 //# sourceMappingURL=apis.js.map

package/dist/loaders/apis.js.map

@@ -1 +1 @@
-{"version":3,"file":"apis.js","sources":["../../src/loaders/apis.ts"],"sourcesContent":["import { join, extname, basename } from 'path';\nimport fse, { existsSync } from 'fs-extra';\nimport _ from 'lodash';\nimport { strings, importDefault } from '@strapi/utils';\nimport { isEmpty } from 'lodash/fp';\nimport type { Strapi, Common, Schema } from '@strapi/types';\nimport { getGlobalId, type ContentTypeDefinition } from '../domain/content-type';\n\ninterface API {\n  bootstrap: () => void | Promise<void>;\n  destroy: () => void | Promise<void>;\n  register: () => void | Promise<void>;\n  config: Record<string, unknown>;\n  routes: Record<string, Common.Router>;\n  controllers: Record<string, Common.Controller>;\n  services: Record<string, Common.Service>;\n  policies: Record<string, Common.Policy>;\n  middlewares: Record<string, Common.Middleware>;\n  contentTypes: Record<string, { schema: Schema.ContentType }>;\n}\n\ninterface APIs {\n  [key: string]: API;\n}\n\nconst DEFAULT_CONTENT_TYPE = {\n  schema: {},\n  actions: {},\n  lifecycles: {},\n};\n\n// to handle names with numbers in it we first check if it is already in kebabCase\nconst normalizeName = (name: string) => (strings.isKebabCase(name) ? name : _.kebabCase(name));\n\nconst isDirectory = (fd: fse.Dirent) => fd.isDirectory();\nconst isDotFile = (fd: fse.Dirent) => fd.name.startsWith('.');\n\nexport default async function loadAPIs(strapi: Strapi) {\n  if (!existsSync(strapi.dirs.dist.api)) {\n    return;\n  }\n\n  const apisFDs = await (await fse.readdir(strapi.dirs.dist.api, { withFileTypes: true }))\n    .filter(isDirectory)\n    .filter(_.negate(isDotFile));\n\n  const apis: APIs = {};\n\n  // only load folders\n  for (const apiFD of apisFDs) {\n    const apiName = normalizeName(apiFD.name);\n    const api = await loadAPI(apiName, join(strapi.dirs.dist.api, apiFD.name));\n\n    apis[apiName] = api;\n  }\n\n  validateContentTypesUnicity(apis);\n\n  for (const apiName of Object.keys(apis)) {\n    strapi.get('apis').add(apiName, apis[apiName]);\n  }\n}\n\nconst validateContentTypesUnicity = (apis: APIs) => {\n  const allApisSchemas = Object.values(apis).flatMap((api) => Object.values(api.contentTypes));\n\n  const names: string[] = [];\n  allApisSchemas.forEach(({ schema }) => {\n    if (schema.info.singularName) {\n      const singularName = _.kebabCase(schema.info.singularName);\n      if (names.includes(singularName)) {\n        throw new Error(`The singular name \"${schema.info.singularName}\" should be unique`);\n      }\n      names.push(singularName);\n    }\n\n    if (schema.info.pluralName) {\n      const pluralName = _.kebabCase(schema.info.pluralName);\n      if (names.includes(pluralName)) {\n        throw new Error(`The plural name \"${schema.info.pluralName}\" should be unique`);\n      }\n      names.push(pluralName);\n    }\n  });\n};\n\nconst loadAPI = async (apiName: string, dir: string) => {\n  const [index, config, routes, controllers, services, policies, middlewares, contentTypes] =\n    await Promise.all([\n      loadIndex(dir),\n      loadDir(join(dir, 'config')),\n      loadDir(join(dir, 'routes')),\n      loadDir(join(dir, 'controllers')),\n      loadDir(join(dir, 'services')),\n      loadDir(join(dir, 'policies')),\n      loadDir(join(dir, 'middlewares')),\n      loadContentTypes(apiName, join(dir, 'content-types')),\n    ]);\n\n  return {\n    ...(index || {}),\n    config: config || {},\n    routes: routes || [],\n    controllers: controllers || {},\n    services: services || {},\n    policies: policies || {},\n    middlewares: middlewares || {},\n    contentTypes: contentTypes || {},\n  };\n};\n\nconst loadIndex = async (dir: string) => {\n  if (await fse.pathExists(join(dir, 'index.js'))) {\n    return loadFile(join(dir, 'index.js'));\n  }\n};\n\nconst loadContentTypes = async (apiName: string, dir: string) => {\n  if (!(await fse.pathExists(dir))) {\n    return;\n  }\n\n  const fds = await fse.readdir(dir, { withFileTypes: true });\n  const contentTypes: API['contentTypes'] = {};\n\n  // only load folders\n  for (const fd of fds) {\n    if (fd.isFile()) {\n      continue;\n    }\n\n    const contentTypeName = normalizeName(fd.name);\n    const loadedContentType = await loadDir(join(dir, fd.name));\n\n    if (isEmpty(loadedContentType) || isEmpty(loadedContentType.schema)) {\n      throw new Error(`Could not load content type found at ${dir}`);\n    }\n\n    const contentType = {\n      ...DEFAULT_CONTENT_TYPE,\n      ...loadedContentType,\n    } as ContentTypeDefinition;\n\n    Object.assign(contentType.schema, {\n      apiName,\n      collectionName: contentType.schema.collectionName || contentType.schema.info.singularName,\n      globalId: getGlobalId(contentType.schema),\n    });\n\n    contentTypes[normalizeName(contentTypeName)] = contentType;\n  }\n\n  return contentTypes;\n};\n\nconst loadDir = async (dir: string) => {\n  if (!(await fse.pathExists(dir))) {\n    return;\n  }\n\n  const fds = await fse.readdir(dir, { withFileTypes: true });\n\n  const root: Record<string, unknown> = {};\n  for (const fd of fds) {\n    if (!fd.isFile() || extname(fd.name) === '.map') {\n      continue;\n    }\n\n    const key = basename(fd.name, extname(fd.name));\n\n    root[normalizeName(key)] = await loadFile(join(dir, fd.name));\n  }\n\n  return root;\n};\n\nconst loadFile = (file: string) => {\n  const ext = extname(file);\n\n  switch (ext) {\n    case '.js':\n      return importDefault(file);\n    case '.json':\n      return fse.readJSON(file);\n    default:\n      return {};\n  }\n};\n"],"names":["strings","_","existsSync","fse","join","index","isEmpty","getGlobalId","extname","basename","importDefault"],"mappings":"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"}
+{"version":3,"file":"apis.js","sources":["../../src/loaders/apis.ts"],"sourcesContent":["import { join, extname, basename } from 'path';\nimport fse, { existsSync } from 'fs-extra';\nimport _ from 'lodash';\nimport { strings, importDefault } from '@strapi/utils';\nimport { isEmpty } from 'lodash/fp';\nimport type { Core, Struct } from '@strapi/types';\nimport { getGlobalId, type ContentTypeDefinition } from '../domain/content-type';\n\ninterface API {\n  bootstrap: () => void | Promise<void>;\n  destroy: () => void | Promise<void>;\n  register: () => void | Promise<void>;\n  config: Record<string, unknown>;\n  routes: Record<string, Core.Router>;\n  controllers: Record<string, Core.Controller>;\n  services: Record<string, Core.Service>;\n  policies: Record<string, Core.Policy>;\n  middlewares: Record<string, Core.Middleware>;\n  contentTypes: Record<string, { schema: Struct.ContentTypeSchema }>;\n}\n\ninterface APIs {\n  [key: string]: API;\n}\n\nconst DEFAULT_CONTENT_TYPE = {\n  schema: {},\n  actions: {},\n  lifecycles: {},\n};\n\n// to handle names with numbers in it we first check if it is already in kebabCase\nconst normalizeName = (name: string) => (strings.isKebabCase(name) ? name : _.kebabCase(name));\n\nconst isDirectory = (fd: fse.Dirent) => fd.isDirectory();\nconst isDotFile = (fd: fse.Dirent) => fd.name.startsWith('.');\n\nexport default async function loadAPIs(strapi: Core.Strapi) {\n  if (!existsSync(strapi.dirs.dist.api)) {\n    return;\n  }\n\n  const apisFDs = await (await fse.readdir(strapi.dirs.dist.api, { withFileTypes: true }))\n    .filter(isDirectory)\n    .filter(_.negate(isDotFile));\n\n  const apis: APIs = {};\n\n  // only load folders\n  for (const apiFD of apisFDs) {\n    const apiName = normalizeName(apiFD.name);\n    const api = await loadAPI(apiName, join(strapi.dirs.dist.api, apiFD.name));\n\n    // @ts-expect-error TODO verify that it's a valid api, not missing bootstrap, register, and destroy\n    apis[apiName] = api;\n  }\n\n  validateContentTypesUnicity(apis);\n\n  for (const apiName of Object.keys(apis)) {\n    strapi.get('apis').add(apiName, apis[apiName]);\n  }\n}\n\nconst validateContentTypesUnicity = (apis: APIs) => {\n  const allApisSchemas = Object.values(apis).flatMap((api) => Object.values(api.contentTypes));\n\n  const names: string[] = [];\n  allApisSchemas.forEach(({ schema }) => {\n    if (schema.info.singularName) {\n      const singularName = _.kebabCase(schema.info.singularName);\n      if (names.includes(singularName)) {\n        throw new Error(`The singular name \"${schema.info.singularName}\" should be unique`);\n      }\n      names.push(singularName);\n    }\n\n    if (schema.info.pluralName) {\n      const pluralName = _.kebabCase(schema.info.pluralName);\n      if (names.includes(pluralName)) {\n        throw new Error(`The plural name \"${schema.info.pluralName}\" should be unique`);\n      }\n      names.push(pluralName);\n    }\n  });\n};\n\nconst loadAPI = async (apiName: string, dir: string) => {\n  const [index, config, routes, controllers, services, policies, middlewares, contentTypes] = (\n    await Promise.all([\n      loadIndex(dir),\n      loadDir(join(dir, 'config')),\n      loadDir(join(dir, 'routes')),\n      loadDir(join(dir, 'controllers')),\n      loadDir(join(dir, 'services')),\n      loadDir(join(dir, 'policies')),\n      loadDir(join(dir, 'middlewares')),\n      loadContentTypes(apiName, join(dir, 'content-types')),\n    ])\n  ).map((result) => result?.result);\n\n  return {\n    ...(index || {}),\n    config: config || {},\n    routes: routes || [],\n    controllers: controllers || {},\n    services: services || {},\n    policies: policies || {},\n    middlewares: middlewares || {},\n    contentTypes: contentTypes || {},\n  };\n};\n\nconst loadIndex = async (dir: string) => {\n  if (await fse.pathExists(join(dir, 'index.js'))) {\n    return loadFile(join(dir, 'index.js'));\n  }\n};\n\n// because this is async and its contents are dynamic, we must return it within an object to avoid a property called `then` being interpreted as a Promise\nconst loadContentTypes = async (apiName: string, dir: string) => {\n  if (!(await fse.pathExists(dir))) {\n    return;\n  }\n\n  const fds = await fse.readdir(dir, { withFileTypes: true });\n  const contentTypes: API['contentTypes'] = {};\n\n  // only load folders\n  for (const fd of fds) {\n    if (fd.isFile()) {\n      continue;\n    }\n\n    const contentTypeName = normalizeName(fd.name);\n    const loadedContentType = (await loadDir(join(dir, fd.name)))?.result;\n\n    if (isEmpty(loadedContentType) || isEmpty(loadedContentType.schema)) {\n      throw new Error(`Could not load content type found at ${dir}`);\n    }\n\n    const contentType = {\n      ...DEFAULT_CONTENT_TYPE,\n      ...loadedContentType,\n    } as ContentTypeDefinition;\n\n    Object.assign(contentType.schema, {\n      apiName,\n      collectionName: contentType.schema.collectionName || contentType.schema.info.singularName,\n      globalId: getGlobalId(contentType.schema),\n    });\n\n    contentTypes[normalizeName(contentTypeName)] = contentType;\n  }\n\n  return { result: contentTypes };\n};\n\n// because this is async and its contents are dynamic, we must return it within an object to avoid a property called `then` being interpreted as a Promise\nconst loadDir = async (dir: string) => {\n  if (!(await fse.pathExists(dir))) {\n    return;\n  }\n\n  const fds = await fse.readdir(dir, { withFileTypes: true });\n\n  const root: Record<string, unknown> = {};\n  for (const fd of fds) {\n    if (!fd.isFile() || extname(fd.name) === '.map') {\n      continue;\n    }\n\n    const key = basename(fd.name, extname(fd.name));\n\n    root[normalizeName(key)] = (await loadFile(join(dir, fd.name))).result;\n  }\n\n  return { result: root };\n};\n\n// because this is async and its contents are dynamic, we must return it as an array to avoid a property called `then` being interpreted as a Promise\nconst loadFile = async (file: string): Promise<{ result: unknown }> => {\n  const ext = extname(file);\n\n  switch (ext) {\n    case '.js':\n      return { result: importDefault(file) };\n    case '.json':\n      return { result: await fse.readJSON(file) };\n    default:\n      return { result: {} };\n  }\n};\n"],"names":["DEFAULT_CONTENT_TYPE","schema","actions","lifecycles","normalizeName","name","strings","isKebabCase","_","kebabCase","isDirectory","fd","isDotFile","startsWith","loadAPIs","strapi","existsSync","dirs","dist","api","apisFDs","fse","readdir","withFileTypes","filter","negate","apis","apiFD","apiName","loadAPI","join","validateContentTypesUnicity","Object","keys","get","add","allApisSchemas","values","flatMap","contentTypes","names","forEach","info","singularName","includes","Error","push","pluralName","dir","index","config","routes","controllers","services","policies","middlewares","Promise","all","loadIndex","loadDir","loadContentTypes","map","result","pathExists","loadFile","fds","isFile","contentTypeName","loadedContentType","isEmpty","contentType","assign","collectionName","globalId","getGlobalId","root","extname","key","basename","file","ext","importDefault","readJSON"],"mappings":"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"}

package/dist/loaders/apis.mjs

@@ -1,135 +1,158 @@
-import { join, extname, basename } from "path";
-import fse, { existsSync } from "fs-extra";
-import _ from "lodash";
-import { strings, importDefault } from "@strapi/utils";
-import { isEmpty } from "lodash/fp";
-import { getGlobalId } from "../domain/content-type/index.mjs";
+import { join, extname, basename } from 'path';
+import fse, { existsSync } from 'fs-extra';
+import _ from 'lodash';
+import { strings, importDefault } from '@strapi/utils';
+import { isEmpty } from 'lodash/fp';
+import { getGlobalId } from '../domain/content-type/index.mjs';
+
 const DEFAULT_CONTENT_TYPE = {
-  schema: {},
-  actions: {},
-  lifecycles: {}
+    schema: {},
+    actions: {},
+    lifecycles: {}
 };
-const normalizeName = (name) => strings.isKebabCase(name) ? name : _.kebabCase(name);
-const isDirectory = (fd) => fd.isDirectory();
-const isDotFile = (fd) => fd.name.startsWith(".");
+// to handle names with numbers in it we first check if it is already in kebabCase
+const normalizeName = (name)=>strings.isKebabCase(name) ? name : _.kebabCase(name);
+const isDirectory = (fd)=>fd.isDirectory();
+const isDotFile = (fd)=>fd.name.startsWith('.');
 async function loadAPIs(strapi) {
-  if (!existsSync(strapi.dirs.dist.api)) {
-    return;
-  }
-  const apisFDs = await (await fse.readdir(strapi.dirs.dist.api, { withFileTypes: true })).filter(isDirectory).filter(_.negate(isDotFile));
-  const apis = {};
-  for (const apiFD of apisFDs) {
-    const apiName = normalizeName(apiFD.name);
-    const api = await loadAPI(apiName, join(strapi.dirs.dist.api, apiFD.name));
-    apis[apiName] = api;
-  }
-  validateContentTypesUnicity(apis);
-  for (const apiName of Object.keys(apis)) {
-    strapi.get("apis").add(apiName, apis[apiName]);
-  }
-}
-const validateContentTypesUnicity = (apis) => {
-  const allApisSchemas = Object.values(apis).flatMap((api) => Object.values(api.contentTypes));
-  const names = [];
-  allApisSchemas.forEach(({ schema }) => {
-    if (schema.info.singularName) {
-      const singularName = _.kebabCase(schema.info.singularName);
-      if (names.includes(singularName)) {
-        throw new Error(`The singular name "${schema.info.singularName}" should be unique`);
-      }
-      names.push(singularName);
+    if (!existsSync(strapi.dirs.dist.api)) {
+        return;
+    }
+    const apisFDs = await (await fse.readdir(strapi.dirs.dist.api, {
+        withFileTypes: true
+    })).filter(isDirectory).filter(_.negate(isDotFile));
+    const apis = {};
+    // only load folders
+    for (const apiFD of apisFDs){
+        const apiName = normalizeName(apiFD.name);
+        const api = await loadAPI(apiName, join(strapi.dirs.dist.api, apiFD.name));
+        // @ts-expect-error TODO verify that it's a valid api, not missing bootstrap, register, and destroy
+        apis[apiName] = api;
     }
-    if (schema.info.pluralName) {
-      const pluralName = _.kebabCase(schema.info.pluralName);
-      if (names.includes(pluralName)) {
-        throw new Error(`The plural name "${schema.info.pluralName}" should be unique`);
-      }
-      names.push(pluralName);
+    validateContentTypesUnicity(apis);
+    for (const apiName of Object.keys(apis)){
+        strapi.get('apis').add(apiName, apis[apiName]);
     }
-  });
+}
+const validateContentTypesUnicity = (apis)=>{
+    const allApisSchemas = Object.values(apis).flatMap((api)=>Object.values(api.contentTypes));
+    const names = [];
+    allApisSchemas.forEach(({ schema })=>{
+        if (schema.info.singularName) {
+            const singularName = _.kebabCase(schema.info.singularName);
+            if (names.includes(singularName)) {
+                throw new Error(`The singular name "${schema.info.singularName}" should be unique`);
+            }
+            names.push(singularName);
+        }
+        if (schema.info.pluralName) {
+            const pluralName = _.kebabCase(schema.info.pluralName);
+            if (names.includes(pluralName)) {
+                throw new Error(`The plural name "${schema.info.pluralName}" should be unique`);
+            }
+            names.push(pluralName);
+        }
+    });
 };
-const loadAPI = async (apiName, dir) => {
-  const [index, config, routes, controllers, services, policies, middlewares, contentTypes] = await Promise.all([
-    loadIndex(dir),
-    loadDir(join(dir, "config")),
-    loadDir(join(dir, "routes")),
-    loadDir(join(dir, "controllers")),
-    loadDir(join(dir, "services")),
-    loadDir(join(dir, "policies")),
-    loadDir(join(dir, "middlewares")),
-    loadContentTypes(apiName, join(dir, "content-types"))
-  ]);
-  return {
-    ...index || {},
-    config: config || {},
-    routes: routes || [],
-    controllers: controllers || {},
-    services: services || {},
-    policies: policies || {},
-    middlewares: middlewares || {},
-    contentTypes: contentTypes || {}
-  };
+const loadAPI = async (apiName, dir)=>{
+    const [index, config, routes, controllers, services, policies, middlewares, contentTypes] = (await Promise.all([
+        loadIndex(dir),
+        loadDir(join(dir, 'config')),
+        loadDir(join(dir, 'routes')),
+        loadDir(join(dir, 'controllers')),
+        loadDir(join(dir, 'services')),
+        loadDir(join(dir, 'policies')),
+        loadDir(join(dir, 'middlewares')),
+        loadContentTypes(apiName, join(dir, 'content-types'))
+    ])).map((result)=>result?.result);
+    return {
+        ...index || {},
+        config: config || {},
+        routes: routes || [],
+        controllers: controllers || {},
+        services: services || {},
+        policies: policies || {},
+        middlewares: middlewares || {},
+        contentTypes: contentTypes || {}
+    };
 };
-const loadIndex = async (dir) => {
-  if (await fse.pathExists(join(dir, "index.js"))) {
-    return loadFile(join(dir, "index.js"));
-  }
+const loadIndex = async (dir)=>{
+    if (await fse.pathExists(join(dir, 'index.js'))) {
+        return loadFile(join(dir, 'index.js'));
+    }
 };
-const loadContentTypes = async (apiName, dir) => {
-  if (!await fse.pathExists(dir)) {
-    return;
-  }
-  const fds = await fse.readdir(dir, { withFileTypes: true });
-  const contentTypes = {};
-  for (const fd of fds) {
-    if (fd.isFile()) {
-      continue;
+// because this is async and its contents are dynamic, we must return it within an object to avoid a property called `then` being interpreted as a Promise
+const loadContentTypes = async (apiName, dir)=>{
+    if (!await fse.pathExists(dir)) {
+        return;
     }
-    const contentTypeName = normalizeName(fd.name);
-    const loadedContentType = await loadDir(join(dir, fd.name));
-    if (isEmpty(loadedContentType) || isEmpty(loadedContentType.schema)) {
-      throw new Error(`Could not load content type found at ${dir}`);
+    const fds = await fse.readdir(dir, {
+        withFileTypes: true
+    });
+    const contentTypes = {};
+    // only load folders
+    for (const fd of fds){
+        if (fd.isFile()) {
+            continue;
+        }
+        const contentTypeName = normalizeName(fd.name);
+        const loadedContentType = (await loadDir(join(dir, fd.name)))?.result;
+        if (isEmpty(loadedContentType) || isEmpty(loadedContentType.schema)) {
+            throw new Error(`Could not load content type found at ${dir}`);
+        }
+        const contentType = {
+            ...DEFAULT_CONTENT_TYPE,
+            ...loadedContentType
+        };
+        Object.assign(contentType.schema, {
+            apiName,
+            collectionName: contentType.schema.collectionName || contentType.schema.info.singularName,
+            globalId: getGlobalId(contentType.schema)
+        });
+        contentTypes[normalizeName(contentTypeName)] = contentType;
     }
-    const contentType = {
-      ...DEFAULT_CONTENT_TYPE,
-      ...loadedContentType
+    return {
+        result: contentTypes
     };
-    Object.assign(contentType.schema, {
-      apiName,
-      collectionName: contentType.schema.collectionName || contentType.schema.info.singularName,
-      globalId: getGlobalId(contentType.schema)
-    });
-    contentTypes[normalizeName(contentTypeName)] = contentType;
-  }
-  return contentTypes;
 };
-const loadDir = async (dir) => {
-  if (!await fse.pathExists(dir)) {
-    return;
-  }
-  const fds = await fse.readdir(dir, { withFileTypes: true });
-  const root = {};
-  for (const fd of fds) {
-    if (!fd.isFile() || extname(fd.name) === ".map") {
-      continue;
+// because this is async and its contents are dynamic, we must return it within an object to avoid a property called `then` being interpreted as a Promise
+const loadDir = async (dir)=>{
+    if (!await fse.pathExists(dir)) {
+        return;
     }
-    const key = basename(fd.name, extname(fd.name));
-    root[normalizeName(key)] = await loadFile(join(dir, fd.name));
-  }
-  return root;
-};
-const loadFile = (file) => {
-  const ext = extname(file);
-  switch (ext) {
-    case ".js":
-      return importDefault(file);
-    case ".json":
-      return fse.readJSON(file);
-    default:
-      return {};
-  }
+    const fds = await fse.readdir(dir, {
+        withFileTypes: true
+    });
+    const root = {};
+    for (const fd of fds){
+        if (!fd.isFile() || extname(fd.name) === '.map') {
+            continue;
+        }
+        const key = basename(fd.name, extname(fd.name));
+        root[normalizeName(key)] = (await loadFile(join(dir, fd.name))).result;
+    }
+    return {
+        result: root
+    };
 };
-export {
-  loadAPIs as default
+// because this is async and its contents are dynamic, we must return it as an array to avoid a property called `then` being interpreted as a Promise
+const loadFile = async (file)=>{
+    const ext = extname(file);
+    switch(ext){
+        case '.js':
+            return {
+                result: importDefault(file)
+            };
+        case '.json':
+            return {
+                result: await fse.readJSON(file)
+            };
+        default:
+            return {
+                result: {}
+            };
+    }
 };
+
+export { loadAPIs as default };
 //# sourceMappingURL=apis.mjs.map