@strapi/core 0.0.0-experimental.6dbac0c205b0f8495781db5706c18cac1a62e62b → 0.0.0-experimental.90ca9123352ed07e0a9cedaf4bcad1475e74137f

package/dist/utils/startup-logger.mjs

@@ -1,7 +1,6 @@
 import chalk from "chalk";
 import CLITable from "cli-table3";
 import _ from "lodash/fp";
-import { getAbsoluteAdminUrl, getAbsoluteServerUrl } from "@strapi/utils";
 const createStartupLogger = (app) => {
   return {
     logStats() {
@@ -28,6 +27,9 @@ const createStartupLogger = (app) => {
       console.log();
     },
     logFirstStartupMessage() {
+      if (!strapi.config.get("server.logger.startup.enabled")) {
+        return;
+      }
       this.logStats();
       console.log(chalk.bold("One more thing..."));
       console.log(
@@ -35,38 +37,41 @@ const createStartupLogger = (app) => {
       );
       console.log();
       const addressTable = new CLITable();
-      const adminUrl = getAbsoluteAdminUrl(strapi.config);
+      const adminUrl = strapi.config.get("admin.absoluteUrl");
       addressTable.push([chalk.bold(adminUrl)]);
       console.log(`${addressTable.toString()}`);
       console.log();
     },
     logDefaultStartupMessage() {
+      if (!strapi.config.get("server.logger.startup.enabled")) {
+        return;
+      }
       this.logStats();
       console.log(chalk.bold("Welcome back!"));
-      if (app.config.serveAdminPanel === true) {
+      if (app.config.get("admin.serveAdminPanel") === true) {
         console.log(chalk.grey("To manage your project 🚀, go to the administration panel at:"));
-        const adminUrl = getAbsoluteAdminUrl(strapi.config);
+        const adminUrl = strapi.config.get("admin.absoluteUrl");
         console.log(chalk.bold(adminUrl));
         console.log();
       }
       console.log(chalk.grey("To access the server ⚡️, go to:"));
-      const serverUrl = getAbsoluteServerUrl(strapi.config);
+      const serverUrl = strapi.config.get("server.absoluteUrl");
       console.log(chalk.bold(serverUrl));
       console.log();
     },
     logStartupMessage({ isInitialized }) {
-      const hideStartupMessage = process.env.STRAPI_HIDE_STARTUP_MESSAGE ? process.env.STRAPI_HIDE_STARTUP_MESSAGE === "true" : false;
-      if (hideStartupMessage === false) {
-        if (!isInitialized) {
-          this.logFirstStartupMessage();
-        } else {
-          this.logDefaultStartupMessage();
-        }
+      if (!strapi.config.get("server.logger.startup.enabled")) {
+        return;
+      }
+      if (!isInitialized) {
+        this.logFirstStartupMessage();
+      } else {
+        this.logDefaultStartupMessage();
       }
     }
   };
 };
 export {
-  createStartupLogger as default
+  createStartupLogger
 };
 //# sourceMappingURL=startup-logger.mjs.map

package/dist/utils/startup-logger.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"startup-logger.mjs","sources":["../../src/utils/startup-logger.ts"],"sourcesContent":["import chalk from 'chalk';\nimport CLITable from 'cli-table3';\nimport _ from 'lodash/fp';\nimport { getAbsoluteAdminUrl, getAbsoluteServerUrl } from '@strapi/utils';\n\nimport type { Strapi } from '@strapi/types';\n\nexport default (app: Strapi) => {\n  return {\n    logStats() {\n      const columns = Math.min(process.stderr.columns, 80) - 2;\n      console.log();\n      console.log(chalk.black.bgWhite(_.padEnd(columns, ' Project information')));\n      console.log();\n\n      const infoTable = new CLITable({\n        colWidths: [20, 50],\n        chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },\n      });\n\n      infoTable.push(\n        [chalk.blue('Time'), `${new Date()}`],\n        [chalk.blue('Launched in'), `${Date.now() - app.config.launchedAt} ms`],\n        [chalk.blue('Environment'), app.config.environment],\n        [chalk.blue('Process PID'), process.pid],\n        [chalk.blue('Version'), `${app.config.info.strapi} (node ${process.version})`],\n        [chalk.blue('Edition'), app.EE ? 'Enterprise' : 'Community'],\n        [chalk.blue('Database'), app.db?.dialect.client]\n      );\n\n      console.log(infoTable.toString());\n      console.log();\n      console.log(chalk.black.bgWhite(_.padEnd(columns, ' Actions available')));\n      console.log();\n    },\n\n    logFirstStartupMessage() {\n      this.logStats();\n\n      console.log(chalk.bold('One more thing...'));\n      console.log(\n        chalk.grey('Create your first administrator 💻 by going to the administration panel at:')\n      );\n      console.log();\n\n      const addressTable = new CLITable();\n\n      const adminUrl = getAbsoluteAdminUrl(strapi.config);\n      addressTable.push([chalk.bold(adminUrl)]);\n\n      console.log(`${addressTable.toString()}`);\n      console.log();\n    },\n\n    logDefaultStartupMessage() {\n      this.logStats();\n\n      console.log(chalk.bold('Welcome back!'));\n\n      if (app.config.serveAdminPanel === true) {\n        console.log(chalk.grey('To manage your project 🚀, go to the administration panel at:'));\n        const adminUrl = getAbsoluteAdminUrl(strapi.config);\n        console.log(chalk.bold(adminUrl));\n        console.log();\n      }\n\n      console.log(chalk.grey('To access the server ⚡️, go to:'));\n      const serverUrl = getAbsoluteServerUrl(strapi.config);\n      console.log(chalk.bold(serverUrl));\n      console.log();\n    },\n\n    logStartupMessage({ isInitialized }: { isInitialized: boolean }) {\n      // Should the startup message be displayed?\n      const hideStartupMessage = process.env.STRAPI_HIDE_STARTUP_MESSAGE\n        ? process.env.STRAPI_HIDE_STARTUP_MESSAGE === 'true'\n        : false;\n\n      if (hideStartupMessage === false) {\n        if (!isInitialized) {\n          this.logFirstStartupMessage();\n        } else {\n          this.logDefaultStartupMessage();\n        }\n      }\n    },\n  };\n};\n"],"names":[],"mappings":";;;;AAOA,MAAe,sBAAA,CAAC,QAAgB;AACvB,SAAA;AAAA,IACL,WAAW;AACT,YAAM,UAAU,KAAK,IAAI,QAAQ,OAAO,SAAS,EAAE,IAAI;AACvD,cAAQ,IAAI;AACJ,cAAA,IAAI,MAAM,MAAM,QAAQ,EAAE,OAAO,SAAS,sBAAsB,CAAC,CAAC;AAC1E,cAAQ,IAAI;AAEN,YAAA,YAAY,IAAI,SAAS;AAAA,QAC7B,WAAW,CAAC,IAAI,EAAE;AAAA,QAClB,OAAO,EAAE,KAAK,IAAI,YAAY,IAAI,WAAW,IAAI,aAAa,GAAG;AAAA,MAAA,CAClE;AAES,gBAAA;AAAA,QACR,CAAC,MAAM,KAAK,MAAM,GAAG,GAAG,oBAAI,KAAM,CAAA,EAAE;AAAA,QACpC,CAAC,MAAM,KAAK,aAAa,GAAG,GAAG,KAAK,IAAA,IAAQ,IAAI,OAAO,UAAU,KAAK;AAAA,QACtE,CAAC,MAAM,KAAK,aAAa,GAAG,IAAI,OAAO,WAAW;AAAA,QAClD,CAAC,MAAM,KAAK,aAAa,GAAG,QAAQ,GAAG;AAAA,QACvC,CAAC,MAAM,KAAK,SAAS,GAAG,GAAG,IAAI,OAAO,KAAK,MAAM,UAAU,QAAQ,OAAO,GAAG;AAAA,QAC7E,CAAC,MAAM,KAAK,SAAS,GAAG,IAAI,KAAK,eAAe,WAAW;AAAA,QAC3D,CAAC,MAAM,KAAK,UAAU,GAAG,IAAI,IAAI,QAAQ,MAAM;AAAA,MAAA;AAGzC,cAAA,IAAI,UAAU,SAAU,CAAA;AAChC,cAAQ,IAAI;AACJ,cAAA,IAAI,MAAM,MAAM,QAAQ,EAAE,OAAO,SAAS,oBAAoB,CAAC,CAAC;AACxE,cAAQ,IAAI;AAAA,IACd;AAAA,IAEA,yBAAyB;AACvB,WAAK,SAAS;AAEd,cAAQ,IAAI,MAAM,KAAK,mBAAmB,CAAC;AACnC,cAAA;AAAA,QACN,MAAM,KAAK,6EAA6E;AAAA,MAAA;AAE1F,cAAQ,IAAI;AAEN,YAAA,eAAe,IAAI;AAEnB,YAAA,WAAW,oBAAoB,OAAO,MAAM;AAClD,mBAAa,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;AAExC,cAAQ,IAAI,GAAG,aAAa,SAAA,CAAU,EAAE;AACxC,cAAQ,IAAI;AAAA,IACd;AAAA,IAEA,2BAA2B;AACzB,WAAK,SAAS;AAEd,cAAQ,IAAI,MAAM,KAAK,eAAe,CAAC;AAEnC,UAAA,IAAI,OAAO,oBAAoB,MAAM;AACvC,gBAAQ,IAAI,MAAM,KAAK,+DAA+D,CAAC;AACjF,cAAA,WAAW,oBAAoB,OAAO,MAAM;AAClD,gBAAQ,IAAI,MAAM,KAAK,QAAQ,CAAC;AAChC,gBAAQ,IAAI;AAAA,MACd;AAEA,cAAQ,IAAI,MAAM,KAAK,iCAAiC,CAAC;AACnD,YAAA,YAAY,qBAAqB,OAAO,MAAM;AACpD,cAAQ,IAAI,MAAM,KAAK,SAAS,CAAC;AACjC,cAAQ,IAAI;AAAA,IACd;AAAA,IAEA,kBAAkB,EAAE,iBAA6C;AAE/D,YAAM,qBAAqB,QAAQ,IAAI,8BACnC,QAAQ,IAAI,gCAAgC,SAC5C;AAEJ,UAAI,uBAAuB,OAAO;AAChC,YAAI,CAAC,eAAe;AAClB,eAAK,uBAAuB;AAAA,QAAA,OACvB;AACL,eAAK,yBAAyB;AAAA,QAChC;AAAA,MACF;AAAA,IACF;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"startup-logger.mjs","sources":["../../src/utils/startup-logger.ts"],"sourcesContent":["import chalk from 'chalk';\nimport CLITable from 'cli-table3';\nimport _ from 'lodash/fp';\n\nimport type { Strapi } from '@strapi/types';\n\nexport const createStartupLogger = (app: Strapi) => {\n  return {\n    logStats() {\n      const columns = Math.min(process.stderr.columns, 80) - 2;\n      console.log();\n      console.log(chalk.black.bgWhite(_.padEnd(columns, ' Project information')));\n      console.log();\n\n      const infoTable = new CLITable({\n        colWidths: [20, 50],\n        chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },\n      });\n\n      infoTable.push(\n        [chalk.blue('Time'), `${new Date()}`],\n        [chalk.blue('Launched in'), `${Date.now() - app.config.launchedAt} ms`],\n        [chalk.blue('Environment'), app.config.environment],\n        [chalk.blue('Process PID'), process.pid],\n        [chalk.blue('Version'), `${app.config.info.strapi} (node ${process.version})`],\n        [chalk.blue('Edition'), app.EE ? 'Enterprise' : 'Community'],\n        [chalk.blue('Database'), app.db?.dialect.client]\n      );\n\n      console.log(infoTable.toString());\n      console.log();\n      console.log(chalk.black.bgWhite(_.padEnd(columns, ' Actions available')));\n      console.log();\n    },\n\n    logFirstStartupMessage() {\n      if (!strapi.config.get('server.logger.startup.enabled')) {\n        return;\n      }\n\n      this.logStats();\n\n      console.log(chalk.bold('One more thing...'));\n      console.log(\n        chalk.grey('Create your first administrator 💻 by going to the administration panel at:')\n      );\n      console.log();\n\n      const addressTable = new CLITable();\n\n      const adminUrl = strapi.config.get('admin.absoluteUrl');\n      addressTable.push([chalk.bold(adminUrl)]);\n\n      console.log(`${addressTable.toString()}`);\n      console.log();\n    },\n\n    logDefaultStartupMessage() {\n      if (!strapi.config.get('server.logger.startup.enabled')) {\n        return;\n      }\n      this.logStats();\n\n      console.log(chalk.bold('Welcome back!'));\n\n      if (app.config.get('admin.serveAdminPanel') === true) {\n        console.log(chalk.grey('To manage your project 🚀, go to the administration panel at:'));\n        const adminUrl = strapi.config.get('admin.absoluteUrl');\n        console.log(chalk.bold(adminUrl));\n        console.log();\n      }\n\n      console.log(chalk.grey('To access the server ⚡️, go to:'));\n      const serverUrl = strapi.config.get('server.absoluteUrl');\n      console.log(chalk.bold(serverUrl));\n      console.log();\n    },\n\n    logStartupMessage({ isInitialized }: { isInitialized: boolean }) {\n      if (!strapi.config.get('server.logger.startup.enabled')) {\n        return;\n      }\n      if (!isInitialized) {\n        this.logFirstStartupMessage();\n      } else {\n        this.logDefaultStartupMessage();\n      }\n    },\n  };\n};\n"],"names":[],"mappings":";;;AAMa,MAAA,sBAAsB,CAAC,QAAgB;AAC3C,SAAA;AAAA,IACL,WAAW;AACT,YAAM,UAAU,KAAK,IAAI,QAAQ,OAAO,SAAS,EAAE,IAAI;AACvD,cAAQ,IAAI;AACJ,cAAA,IAAI,MAAM,MAAM,QAAQ,EAAE,OAAO,SAAS,sBAAsB,CAAC,CAAC;AAC1E,cAAQ,IAAI;AAEN,YAAA,YAAY,IAAI,SAAS;AAAA,QAC7B,WAAW,CAAC,IAAI,EAAE;AAAA,QAClB,OAAO,EAAE,KAAK,IAAI,YAAY,IAAI,WAAW,IAAI,aAAa,GAAG;AAAA,MAAA,CAClE;AAES,gBAAA;AAAA,QACR,CAAC,MAAM,KAAK,MAAM,GAAG,GAAG,oBAAI,KAAM,CAAA,EAAE;AAAA,QACpC,CAAC,MAAM,KAAK,aAAa,GAAG,GAAG,KAAK,IAAA,IAAQ,IAAI,OAAO,UAAU,KAAK;AAAA,QACtE,CAAC,MAAM,KAAK,aAAa,GAAG,IAAI,OAAO,WAAW;AAAA,QAClD,CAAC,MAAM,KAAK,aAAa,GAAG,QAAQ,GAAG;AAAA,QACvC,CAAC,MAAM,KAAK,SAAS,GAAG,GAAG,IAAI,OAAO,KAAK,MAAM,UAAU,QAAQ,OAAO,GAAG;AAAA,QAC7E,CAAC,MAAM,KAAK,SAAS,GAAG,IAAI,KAAK,eAAe,WAAW;AAAA,QAC3D,CAAC,MAAM,KAAK,UAAU,GAAG,IAAI,IAAI,QAAQ,MAAM;AAAA,MAAA;AAGzC,cAAA,IAAI,UAAU,SAAU,CAAA;AAChC,cAAQ,IAAI;AACJ,cAAA,IAAI,MAAM,MAAM,QAAQ,EAAE,OAAO,SAAS,oBAAoB,CAAC,CAAC;AACxE,cAAQ,IAAI;AAAA,IACd;AAAA,IAEA,yBAAyB;AACvB,UAAI,CAAC,OAAO,OAAO,IAAI,+BAA+B,GAAG;AACvD;AAAA,MACF;AAEA,WAAK,SAAS;AAEd,cAAQ,IAAI,MAAM,KAAK,mBAAmB,CAAC;AACnC,cAAA;AAAA,QACN,MAAM,KAAK,6EAA6E;AAAA,MAAA;AAE1F,cAAQ,IAAI;AAEN,YAAA,eAAe,IAAI;AAEzB,YAAM,WAAW,OAAO,OAAO,IAAI,mBAAmB;AACtD,mBAAa,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;AAExC,cAAQ,IAAI,GAAG,aAAa,SAAA,CAAU,EAAE;AACxC,cAAQ,IAAI;AAAA,IACd;AAAA,IAEA,2BAA2B;AACzB,UAAI,CAAC,OAAO,OAAO,IAAI,+BAA+B,GAAG;AACvD;AAAA,MACF;AACA,WAAK,SAAS;AAEd,cAAQ,IAAI,MAAM,KAAK,eAAe,CAAC;AAEvC,UAAI,IAAI,OAAO,IAAI,uBAAuB,MAAM,MAAM;AACpD,gBAAQ,IAAI,MAAM,KAAK,+DAA+D,CAAC;AACvF,cAAM,WAAW,OAAO,OAAO,IAAI,mBAAmB;AACtD,gBAAQ,IAAI,MAAM,KAAK,QAAQ,CAAC;AAChC,gBAAQ,IAAI;AAAA,MACd;AAEA,cAAQ,IAAI,MAAM,KAAK,iCAAiC,CAAC;AACzD,YAAM,YAAY,OAAO,OAAO,IAAI,oBAAoB;AACxD,cAAQ,IAAI,MAAM,KAAK,SAAS,CAAC;AACjC,cAAQ,IAAI;AAAA,IACd;AAAA,IAEA,kBAAkB,EAAE,iBAA6C;AAC/D,UAAI,CAAC,OAAO,OAAO,IAAI,+BAA+B,GAAG;AACvD;AAAA,MACF;AACA,UAAI,CAAC,eAAe;AAClB,aAAK,uBAAuB;AAAA,MAAA,OACvB;AACL,aAAK,yBAAyB;AAAA,MAChC;AAAA,IACF;AAAA,EAAA;AAEJ;"}

package/dist/utils/transform-content-types-to-models.d.ts

@@ -1,6 +1,6 @@
-import { DatabaseConfig } from '@strapi/database';
+import { Model } from '@strapi/database';
 import { Schema } from '@strapi/types';
 import { createId } from '@paralleldrive/cuid2';
 export declare const createDocumentId: typeof createId;
-export declare const transformContentTypesToModels: (contentTypes: Pick<Schema.ContentType, 'uid' | 'modelName' | 'collectionName' | 'attributes' | 'modelType'>[]) => DatabaseConfig['models'];
+export declare const transformContentTypesToModels: (contentTypes: Schema.ContentType[]) => Model[];
 //# sourceMappingURL=transform-content-types-to-models.d.ts.map

package/dist/utils/transform-content-types-to-models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform-content-types-to-models.d.ts","sourceRoot":"","sources":["../../src/utils/transform-content-types-to-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAa,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAkBhD,eAAO,MAAM,gBAAgB,iBAAW,CAAC;AAEzC,eAAO,MAAM,6BAA6B,iBAC1B,KACZ,OAAO,WAAW,EAClB,KAAK,GAAG,WAAW,GAAG,gBAAgB,GAAG,YAAY,GAAG,WAAW,CACpE,EAAE,KACF,cAAc,CAAC,QAAQ,CAsCzB,CAAC"}
+{"version":3,"file":"transform-content-types-to-models.d.ts","sourceRoot":"","sources":["../../src/utils/transform-content-types-to-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAa,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAmGhD,eAAO,MAAM,gBAAgB,iBAAW,CAAC;AAuEzC,eAAO,MAAM,6BAA6B,iBAAkB,OAAO,WAAW,EAAE,KAAG,KAAK,EA8CvF,CAAC"}

package/dist/utils/transform-content-types-to-models.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const cuid2 = require("@paralleldrive/cuid2");
-const transformAttribute = (attribute) => {
+const assert = require("node:assert");
+const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
+const assert__default = /* @__PURE__ */ _interopDefault(assert);
+const transformAttribute = (name, attribute, contentType) => {
   switch (attribute.type) {
     case "media": {
       return {
@@ -11,16 +14,157 @@ const transformAttribute = (attribute) => {
         morphBy: "related"
       };
     }
+    case "component": {
+      return {
+        type: "relation",
+        relation: attribute.repeatable === true ? "oneToMany" : "oneToOne",
+        target: attribute.component,
+        // We need the join table name to be deterministic,
+        // We need to allow passing the join table name as an option
+        joinTable: {
+          name: `${contentType.collectionName}_components`,
+          joinColumn: {
+            name: "entity_id",
+            referencedColumn: "id"
+          },
+          inverseJoinColumn: {
+            name: "component_id",
+            referencedColumn: "id"
+          },
+          on: {
+            field: name
+          },
+          orderColumnName: "order",
+          orderBy: {
+            order: "asc"
+          },
+          pivotColumns: ["entity_id", "component_id", "field", "component_type"]
+        }
+      };
+    }
+    case "dynamiczone": {
+      return {
+        type: "relation",
+        relation: "morphToMany",
+        // TODO: handle restrictions at some point
+        // target: attribute.components,
+        joinTable: {
+          name: `${contentType.collectionName}_components`,
+          joinColumn: {
+            name: "entity_id",
+            referencedColumn: "id"
+          },
+          morphColumn: {
+            idColumn: {
+              name: "component_id",
+              referencedColumn: "id"
+            },
+            typeColumn: {
+              name: "component_type"
+            },
+            typeField: "__component"
+          },
+          on: {
+            field: name
+          },
+          orderBy: {
+            order: "asc"
+          },
+          pivotColumns: ["entity_id", "component_id", "field", "component_type"]
+        }
+      };
+    }
     default: {
       return attribute;
     }
   }
 };
+const transformAttributes = (contentType) => {
+  return Object.keys(contentType.attributes || {}).reduce((attrs, attrName) => {
+    return {
+      ...attrs,
+      [attrName]: transformAttribute(attrName, contentType.attributes[attrName], contentType)
+    };
+  }, {});
+};
+const hasComponentsOrDz = (contentType) => {
+  return Object.values(contentType.attributes).some(
+    ({ type }) => type === "dynamiczone" || type === "component"
+  );
+};
 const createDocumentId = cuid2.createId;
+const createCompoLinkModel = (contentType) => {
+  const name = `${contentType.collectionName}_components`;
+  return {
+    // TODO: make sure there can't be any conflicts with a prefix
+    singularName: name,
+    uid: name,
+    tableName: name,
+    attributes: {
+      id: {
+        type: "increments"
+      },
+      entity_id: {
+        type: "integer",
+        column: {
+          unsigned: true
+        }
+      },
+      component_id: {
+        type: "integer",
+        column: {
+          unsigned: true
+        }
+      },
+      component_type: {
+        type: "string"
+      },
+      field: {
+        type: "string"
+      },
+      order: {
+        type: "float",
+        column: {
+          unsigned: true,
+          defaultTo: null
+        }
+      }
+    },
+    indexes: [
+      {
+        name: `${contentType.collectionName}_field_index`,
+        columns: ["field"]
+      },
+      {
+        name: `${contentType.collectionName}_component_type_index`,
+        columns: ["component_type"]
+      },
+      {
+        name: `${contentType.collectionName}_entity_fk`,
+        columns: ["entity_id"]
+      },
+      {
+        name: `${contentType.collectionName}_unique`,
+        columns: ["entity_id", "component_id", "field", "component_type"],
+        type: "unique"
+      }
+    ],
+    foreignKeys: [
+      {
+        name: `${contentType.collectionName}_entity_fk`,
+        columns: ["entity_id"],
+        referencedColumns: ["id"],
+        referencedTable: contentType.collectionName,
+        onDelete: "CASCADE"
+      }
+    ]
+  };
+};
 const transformContentTypesToModels = (contentTypes) => {
-  return contentTypes.map((contentType) => {
+  const models = [];
+  contentTypes.forEach((contentType) => {
     const documentIdAttribute = contentType.modelType === "contentType" ? { documentId: { type: "string", default: createDocumentId } } : {};
-    const reservedAttributeNames = ["documentId", "document_id"];
+    const reservedAttributeNames = ["documentId", "document_id", "id"];
     reservedAttributeNames.forEach((reservedAttributeName) => {
       if (reservedAttributeName in contentType.attributes) {
         throw new Error(
@@ -28,22 +172,26 @@ const transformContentTypesToModels = (contentTypes) => {
         );
       }
     });
+    if (hasComponentsOrDz(contentType)) {
+      const compoLinkModel = createCompoLinkModel(contentType);
+      models.push(compoLinkModel);
+    }
+    assert__default.default(contentType.collectionName, "Collection name is required");
     const model = {
-      ...contentType,
-      // reuse new model def
+      uid: contentType.uid,
       singularName: contentType.modelName,
       tableName: contentType.collectionName,
       attributes: {
+        id: {
+          type: "increments"
+        },
         ...documentIdAttribute,
-        ...Object.keys(contentType.attributes || {}).reduce((attrs, attrName) => {
-          return Object.assign(attrs, {
-            [attrName]: transformAttribute(contentType.attributes[attrName])
-          });
-        }, {})
+        ...transformAttributes(contentType)
       }
     };
-    return model;
+    models.push(model);
   });
+  return models;
 };
 exports.createDocumentId = createDocumentId;
 exports.transformContentTypesToModels = transformContentTypesToModels;

package/dist/utils/transform-content-types-to-models.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform-content-types-to-models.js","sources":["../../src/utils/transform-content-types-to-models.ts"],"sourcesContent":["import { DatabaseConfig } from '@strapi/database';\nimport { Schema, Attribute } from '@strapi/types';\nimport { createId } from '@paralleldrive/cuid2';\n\nconst transformAttribute = (attribute: Attribute.Any) => {\n  switch (attribute.type) {\n    case 'media': {\n      return {\n        type: 'relation',\n        relation: attribute.multiple === true ? 'morphMany' : 'morphOne',\n        target: 'plugin::upload.file',\n        morphBy: 'related',\n      };\n    }\n    default: {\n      return attribute;\n    }\n  }\n};\n\nexport const createDocumentId = createId;\n\nexport const transformContentTypesToModels = (\n  contentTypes: Pick<\n    Schema.ContentType,\n    'uid' | 'modelName' | 'collectionName' | 'attributes' | 'modelType'\n  >[]\n): DatabaseConfig['models'] => {\n  return contentTypes.map((contentType) => {\n    // Add document id to content types\n    // @ts-expect-error - `default` function is not typed into `Attribute`\n    // as it is not documented\n    const documentIdAttribute: Record<string, Attribute.Any> =\n      contentType.modelType === 'contentType'\n        ? { documentId: { type: 'string', default: createDocumentId } }\n        : {};\n\n    // Prevent user from creating a documentId attribute\n    const reservedAttributeNames = ['documentId', 'document_id'];\n    reservedAttributeNames.forEach((reservedAttributeName) => {\n      if (reservedAttributeName in contentType.attributes) {\n        throw new Error(\n          `The attribute \"${reservedAttributeName}\" is reserved and cannot be used in a model` +\n            `Please rename \"${contentType.modelName}\" attribute \"${reservedAttributeName}\" to something else.`\n        );\n      }\n    });\n\n    const model = {\n      ...contentType,\n      // reuse new model def\n      singularName: contentType.modelName,\n      tableName: contentType.collectionName!,\n      attributes: {\n        ...documentIdAttribute,\n        ...Object.keys(contentType.attributes! || {}).reduce((attrs, attrName) => {\n          return Object.assign(attrs, {\n            [attrName]: transformAttribute(contentType.attributes[attrName]!),\n          });\n        }, {}),\n      },\n    };\n\n    return model;\n  });\n};\n"],"names":["createId"],"mappings":";;;AAIA,MAAM,qBAAqB,CAAC,cAA6B;AACvD,UAAQ,UAAU,MAAM;AAAA,IACtB,KAAK,SAAS;AACL,aAAA;AAAA,QACL,MAAM;AAAA,QACN,UAAU,UAAU,aAAa,OAAO,cAAc;AAAA,QACtD,QAAQ;AAAA,QACR,SAAS;AAAA,MAAA;AAAA,IAEb;AAAA,IACA,SAAS;AACA,aAAA;AAAA,IACT;AAAA,EACF;AACF;AAEO,MAAM,mBAAmBA,MAAA;AAEnB,MAAA,gCAAgC,CAC3C,iBAI6B;AACtB,SAAA,aAAa,IAAI,CAAC,gBAAgB;AAIvC,UAAM,sBACJ,YAAY,cAAc,gBACtB,EAAE,YAAY,EAAE,MAAM,UAAU,SAAS,iBAAiB,EAAA,IAC1D,CAAA;AAGA,UAAA,yBAAyB,CAAC,cAAc,aAAa;AACpC,2BAAA,QAAQ,CAAC,0BAA0B;AACpD,UAAA,yBAAyB,YAAY,YAAY;AACnD,cAAM,IAAI;AAAA,UACR,kBAAkB,qBAAqB,6DACnB,YAAY,SAAS,gBAAgB,qBAAqB;AAAA,QAAA;AAAA,MAElF;AAAA,IAAA,CACD;AAED,UAAM,QAAQ;AAAA,MACZ,GAAG;AAAA;AAAA,MAEH,cAAc,YAAY;AAAA,MAC1B,WAAW,YAAY;AAAA,MACvB,YAAY;AAAA,QACV,GAAG;AAAA,QACH,GAAG,OAAO,KAAK,YAAY,cAAe,CAAE,CAAA,EAAE,OAAO,CAAC,OAAO,aAAa;AACjE,iBAAA,OAAO,OAAO,OAAO;AAAA,YAC1B,CAAC,QAAQ,GAAG,mBAAmB,YAAY,WAAW,QAAQ,CAAE;AAAA,UAAA,CACjE;AAAA,QACH,GAAG,EAAE;AAAA,MACP;AAAA,IAAA;AAGK,WAAA;AAAA,EAAA,CACR;AACH;;;"}
+{"version":3,"file":"transform-content-types-to-models.js","sources":["../../src/utils/transform-content-types-to-models.ts"],"sourcesContent":["import { Model } from '@strapi/database';\nimport { Schema, Attribute } from '@strapi/types';\nimport { createId } from '@paralleldrive/cuid2';\nimport assert from 'node:assert';\n\nconst transformAttribute = (\n  name: string,\n  attribute: Attribute.Any,\n  contentType: Schema.ContentType\n) => {\n  switch (attribute.type) {\n    case 'media': {\n      return {\n        type: 'relation',\n        relation: attribute.multiple === true ? 'morphMany' : 'morphOne',\n        target: 'plugin::upload.file',\n        morphBy: 'related',\n      };\n    }\n    case 'component': {\n      return {\n        type: 'relation',\n        relation: attribute.repeatable === true ? 'oneToMany' : 'oneToOne',\n        target: attribute.component,\n\n        // We need the join table name to be deterministic,\n        // We need to allow passing the join table name as an option\n        joinTable: {\n          name: `${contentType.collectionName}_components`,\n          joinColumn: {\n            name: 'entity_id',\n            referencedColumn: 'id',\n          },\n          inverseJoinColumn: {\n            name: 'component_id',\n            referencedColumn: 'id',\n          },\n          on: {\n            field: name,\n          },\n          orderColumnName: 'order',\n          orderBy: {\n            order: 'asc',\n          },\n          pivotColumns: ['entity_id', 'component_id', 'field', 'component_type'],\n        },\n      };\n    }\n    case 'dynamiczone': {\n      return {\n        type: 'relation',\n        relation: 'morphToMany',\n        // TODO: handle restrictions at some point\n        // target: attribute.components,\n        joinTable: {\n          name: `${contentType.collectionName}_components`,\n          joinColumn: {\n            name: 'entity_id',\n            referencedColumn: 'id',\n          },\n          morphColumn: {\n            idColumn: {\n              name: 'component_id',\n              referencedColumn: 'id',\n            },\n            typeColumn: {\n              name: 'component_type',\n            },\n            typeField: '__component',\n          },\n          on: {\n            field: name,\n          },\n          orderBy: {\n            order: 'asc',\n          },\n          pivotColumns: ['entity_id', 'component_id', 'field', 'component_type'],\n        },\n      };\n    }\n    default: {\n      return attribute;\n    }\n  }\n};\n\nconst transformAttributes = (contentType: Schema.ContentType) => {\n  return Object.keys(contentType.attributes! || {}).reduce((attrs, attrName) => {\n    return {\n      ...attrs,\n      [attrName]: transformAttribute(attrName, contentType.attributes[attrName]!, contentType),\n    };\n  }, {});\n};\n\nconst hasComponentsOrDz = (contentType: Schema.ContentType) => {\n  return Object.values(contentType.attributes).some(\n    ({ type }) => type === 'dynamiczone' || type === 'component'\n  );\n};\n\nexport const createDocumentId = createId;\n\nconst createCompoLinkModel = (contentType: Schema.ContentType): Model => {\n  const name = `${contentType.collectionName}_components`;\n\n  return {\n    // TODO: make sure there can't be any conflicts with a prefix\n    singularName: name,\n    uid: name,\n    tableName: name,\n    attributes: {\n      id: {\n        type: 'increments',\n      },\n      entity_id: {\n        type: 'integer',\n        column: {\n          unsigned: true,\n        },\n      },\n      component_id: {\n        type: 'integer',\n        column: {\n          unsigned: true,\n        },\n      },\n      component_type: {\n        type: 'string',\n      },\n      field: {\n        type: 'string',\n      },\n      order: {\n        type: 'float',\n        column: {\n          unsigned: true,\n          defaultTo: null,\n        },\n      },\n    },\n    indexes: [\n      {\n        name: `${contentType.collectionName}_field_index`,\n        columns: ['field'],\n      },\n      {\n        name: `${contentType.collectionName}_component_type_index`,\n        columns: ['component_type'],\n      },\n      {\n        name: `${contentType.collectionName}_entity_fk`,\n        columns: ['entity_id'],\n      },\n      {\n        name: `${contentType.collectionName}_unique`,\n        columns: ['entity_id', 'component_id', 'field', 'component_type'],\n        type: 'unique',\n      },\n    ],\n    foreignKeys: [\n      {\n        name: `${contentType.collectionName}_entity_fk`,\n        columns: ['entity_id'],\n        referencedColumns: ['id'],\n        referencedTable: contentType.collectionName!,\n        onDelete: 'CASCADE',\n      },\n    ],\n  };\n};\n\nexport const transformContentTypesToModels = (contentTypes: Schema.ContentType[]): Model[] => {\n  const models: Model[] = [];\n\n  contentTypes.forEach((contentType) => {\n    // Add document id to content types\n    // as it is not documented\n    const documentIdAttribute: Record<string, Attribute.Any> =\n      contentType.modelType === 'contentType'\n        ? { documentId: { type: 'string', default: createDocumentId } }\n        : {};\n\n    // Prevent user from creating a documentId attribute\n    const reservedAttributeNames = ['documentId', 'document_id', 'id'];\n    reservedAttributeNames.forEach((reservedAttributeName) => {\n      if (reservedAttributeName in contentType.attributes) {\n        throw new Error(\n          `The attribute \"${reservedAttributeName}\" is reserved and cannot be used in a model` +\n            `Please rename \"${contentType.modelName}\" attribute \"${reservedAttributeName}\" to something else.`\n        );\n      }\n    });\n\n    if (hasComponentsOrDz(contentType)) {\n      const compoLinkModel = createCompoLinkModel(contentType);\n      models.push(compoLinkModel);\n    }\n\n    assert(contentType.collectionName, 'Collection name is required');\n\n    const model: Model = {\n      uid: contentType.uid,\n      singularName: contentType.modelName,\n      tableName: contentType.collectionName,\n      attributes: {\n        id: {\n          type: 'increments',\n        },\n        ...documentIdAttribute,\n        ...transformAttributes(contentType),\n      },\n    };\n\n    models.push(model);\n  });\n\n  return models;\n};\n"],"names":["createId","assert"],"mappings":";;;;;;AAKA,MAAM,qBAAqB,CACzB,MACA,WACA,gBACG;AACH,UAAQ,UAAU,MAAM;AAAA,IACtB,KAAK,SAAS;AACL,aAAA;AAAA,QACL,MAAM;AAAA,QACN,UAAU,UAAU,aAAa,OAAO,cAAc;AAAA,QACtD,QAAQ;AAAA,QACR,SAAS;AAAA,MAAA;AAAA,IAEb;AAAA,IACA,KAAK,aAAa;AACT,aAAA;AAAA,QACL,MAAM;AAAA,QACN,UAAU,UAAU,eAAe,OAAO,cAAc;AAAA,QACxD,QAAQ,UAAU;AAAA;AAAA;AAAA,QAIlB,WAAW;AAAA,UACT,MAAM,GAAG,YAAY,cAAc;AAAA,UACnC,YAAY;AAAA,YACV,MAAM;AAAA,YACN,kBAAkB;AAAA,UACpB;AAAA,UACA,mBAAmB;AAAA,YACjB,MAAM;AAAA,YACN,kBAAkB;AAAA,UACpB;AAAA,UACA,IAAI;AAAA,YACF,OAAO;AAAA,UACT;AAAA,UACA,iBAAiB;AAAA,UACjB,SAAS;AAAA,YACP,OAAO;AAAA,UACT;AAAA,UACA,cAAc,CAAC,aAAa,gBAAgB,SAAS,gBAAgB;AAAA,QACvE;AAAA,MAAA;AAAA,IAEJ;AAAA,IACA,KAAK,eAAe;AACX,aAAA;AAAA,QACL,MAAM;AAAA,QACN,UAAU;AAAA;AAAA;AAAA,QAGV,WAAW;AAAA,UACT,MAAM,GAAG,YAAY,cAAc;AAAA,UACnC,YAAY;AAAA,YACV,MAAM;AAAA,YACN,kBAAkB;AAAA,UACpB;AAAA,UACA,aAAa;AAAA,YACX,UAAU;AAAA,cACR,MAAM;AAAA,cACN,kBAAkB;AAAA,YACpB;AAAA,YACA,YAAY;AAAA,cACV,MAAM;AAAA,YACR;AAAA,YACA,WAAW;AAAA,UACb;AAAA,UACA,IAAI;AAAA,YACF,OAAO;AAAA,UACT;AAAA,UACA,SAAS;AAAA,YACP,OAAO;AAAA,UACT;AAAA,UACA,cAAc,CAAC,aAAa,gBAAgB,SAAS,gBAAgB;AAAA,QACvE;AAAA,MAAA;AAAA,IAEJ;AAAA,IACA,SAAS;AACA,aAAA;AAAA,IACT;AAAA,EACF;AACF;AAEA,MAAM,sBAAsB,CAAC,gBAAoC;AACxD,SAAA,OAAO,KAAK,YAAY,cAAe,CAAE,CAAA,EAAE,OAAO,CAAC,OAAO,aAAa;AACrE,WAAA;AAAA,MACL,GAAG;AAAA,MACH,CAAC,QAAQ,GAAG,mBAAmB,UAAU,YAAY,WAAW,QAAQ,GAAI,WAAW;AAAA,IAAA;AAAA,EAE3F,GAAG,CAAE,CAAA;AACP;AAEA,MAAM,oBAAoB,CAAC,gBAAoC;AAC7D,SAAO,OAAO,OAAO,YAAY,UAAU,EAAE;AAAA,IAC3C,CAAC,EAAE,KAAW,MAAA,SAAS,iBAAiB,SAAS;AAAA,EAAA;AAErD;AAEO,MAAM,mBAAmBA,MAAA;AAEhC,MAAM,uBAAuB,CAAC,gBAA2C;AACjE,QAAA,OAAO,GAAG,YAAY,cAAc;AAEnC,SAAA;AAAA;AAAA,IAEL,cAAc;AAAA,IACd,KAAK;AAAA,IACL,WAAW;AAAA,IACX,YAAY;AAAA,MACV,IAAI;AAAA,QACF,MAAM;AAAA,MACR;AAAA,MACA,WAAW;AAAA,QACT,MAAM;AAAA,QACN,QAAQ;AAAA,UACN,UAAU;AAAA,QACZ;AAAA,MACF;AAAA,MACA,cAAc;AAAA,QACZ,MAAM;AAAA,QACN,QAAQ;AAAA,UACN,UAAU;AAAA,QACZ;AAAA,MACF;AAAA,MACA,gBAAgB;AAAA,QACd,MAAM;AAAA,MACR;AAAA,MACA,OAAO;AAAA,QACL,MAAM;AAAA,MACR;AAAA,MACA,OAAO;AAAA,QACL,MAAM;AAAA,QACN,QAAQ;AAAA,UACN,UAAU;AAAA,UACV,WAAW;AAAA,QACb;AAAA,MACF;AAAA,IACF;AAAA,IACA,SAAS;AAAA,MACP;AAAA,QACE,MAAM,GAAG,YAAY,cAAc;AAAA,QACnC,SAAS,CAAC,OAAO;AAAA,MACnB;AAAA,MACA;AAAA,QACE,MAAM,GAAG,YAAY,cAAc;AAAA,QACnC,SAAS,CAAC,gBAAgB;AAAA,MAC5B;AAAA,MACA;AAAA,QACE,MAAM,GAAG,YAAY,cAAc;AAAA,QACnC,SAAS,CAAC,WAAW;AAAA,MACvB;AAAA,MACA;AAAA,QACE,MAAM,GAAG,YAAY,cAAc;AAAA,QACnC,SAAS,CAAC,aAAa,gBAAgB,SAAS,gBAAgB;AAAA,QAChE,MAAM;AAAA,MACR;AAAA,IACF;AAAA,IACA,aAAa;AAAA,MACX;AAAA,QACE,MAAM,GAAG,YAAY,cAAc;AAAA,QACnC,SAAS,CAAC,WAAW;AAAA,QACrB,mBAAmB,CAAC,IAAI;AAAA,QACxB,iBAAiB,YAAY;AAAA,QAC7B,UAAU;AAAA,MACZ;AAAA,IACF;AAAA,EAAA;AAEJ;AAEa,MAAA,gCAAgC,CAAC,iBAAgD;AAC5F,QAAM,SAAkB,CAAA;AAEX,eAAA,QAAQ,CAAC,gBAAgB;AAGpC,UAAM,sBACJ,YAAY,cAAc,gBACtB,EAAE,YAAY,EAAE,MAAM,UAAU,SAAS,iBAAiB,EAAA,IAC1D,CAAA;AAGN,UAAM,yBAAyB,CAAC,cAAc,eAAe,IAAI;AAC1C,2BAAA,QAAQ,CAAC,0BAA0B;AACpD,UAAA,yBAAyB,YAAY,YAAY;AACnD,cAAM,IAAI;AAAA,UACR,kBAAkB,qBAAqB,6DACnB,YAAY,SAAS,gBAAgB,qBAAqB;AAAA,QAAA;AAAA,MAElF;AAAA,IAAA,CACD;AAEG,QAAA,kBAAkB,WAAW,GAAG;AAC5B,YAAA,iBAAiB,qBAAqB,WAAW;AACvD,aAAO,KAAK,cAAc;AAAA,IAC5B;AAEOC,oBAAAA,QAAA,YAAY,gBAAgB,6BAA6B;AAEhE,UAAM,QAAe;AAAA,MACnB,KAAK,YAAY;AAAA,MACjB,cAAc,YAAY;AAAA,MAC1B,WAAW,YAAY;AAAA,MACvB,YAAY;AAAA,QACV,IAAI;AAAA,UACF,MAAM;AAAA,QACR;AAAA,QACA,GAAG;AAAA,QACH,GAAG,oBAAoB,WAAW;AAAA,MACpC;AAAA,IAAA;AAGF,WAAO,KAAK,KAAK;AAAA,EAAA,CAClB;AAEM,SAAA;AACT;;;"}

package/dist/utils/transform-content-types-to-models.mjs

@@ -1,5 +1,6 @@
 import { createId } from "@paralleldrive/cuid2";
-const transformAttribute = (attribute) => {
+import assert from "node:assert";
+const transformAttribute = (name, attribute, contentType) => {
   switch (attribute.type) {
     case "media": {
       return {
@@ -9,16 +10,157 @@ const transformAttribute = (attribute) => {
         morphBy: "related"
       };
     }
+    case "component": {
+      return {
+        type: "relation",
+        relation: attribute.repeatable === true ? "oneToMany" : "oneToOne",
+        target: attribute.component,
+        // We need the join table name to be deterministic,
+        // We need to allow passing the join table name as an option
+        joinTable: {
+          name: `${contentType.collectionName}_components`,
+          joinColumn: {
+            name: "entity_id",
+            referencedColumn: "id"
+          },
+          inverseJoinColumn: {
+            name: "component_id",
+            referencedColumn: "id"
+          },
+          on: {
+            field: name
+          },
+          orderColumnName: "order",
+          orderBy: {
+            order: "asc"
+          },
+          pivotColumns: ["entity_id", "component_id", "field", "component_type"]
+        }
+      };
+    }
+    case "dynamiczone": {
+      return {
+        type: "relation",
+        relation: "morphToMany",
+        // TODO: handle restrictions at some point
+        // target: attribute.components,
+        joinTable: {
+          name: `${contentType.collectionName}_components`,
+          joinColumn: {
+            name: "entity_id",
+            referencedColumn: "id"
+          },
+          morphColumn: {
+            idColumn: {
+              name: "component_id",
+              referencedColumn: "id"
+            },
+            typeColumn: {
+              name: "component_type"
+            },
+            typeField: "__component"
+          },
+          on: {
+            field: name
+          },
+          orderBy: {
+            order: "asc"
+          },
+          pivotColumns: ["entity_id", "component_id", "field", "component_type"]
+        }
+      };
+    }
     default: {
       return attribute;
     }
   }
 };
+const transformAttributes = (contentType) => {
+  return Object.keys(contentType.attributes || {}).reduce((attrs, attrName) => {
+    return {
+      ...attrs,
+      [attrName]: transformAttribute(attrName, contentType.attributes[attrName], contentType)
+    };
+  }, {});
+};
+const hasComponentsOrDz = (contentType) => {
+  return Object.values(contentType.attributes).some(
+    ({ type }) => type === "dynamiczone" || type === "component"
+  );
+};
 const createDocumentId = createId;
+const createCompoLinkModel = (contentType) => {
+  const name = `${contentType.collectionName}_components`;
+  return {
+    // TODO: make sure there can't be any conflicts with a prefix
+    singularName: name,
+    uid: name,
+    tableName: name,
+    attributes: {
+      id: {
+        type: "increments"
+      },
+      entity_id: {
+        type: "integer",
+        column: {
+          unsigned: true
+        }
+      },
+      component_id: {
+        type: "integer",
+        column: {
+          unsigned: true
+        }
+      },
+      component_type: {
+        type: "string"
+      },
+      field: {
+        type: "string"
+      },
+      order: {
+        type: "float",
+        column: {
+          unsigned: true,
+          defaultTo: null
+        }
+      }
+    },
+    indexes: [
+      {
+        name: `${contentType.collectionName}_field_index`,
+        columns: ["field"]
+      },
+      {
+        name: `${contentType.collectionName}_component_type_index`,
+        columns: ["component_type"]
+      },
+      {
+        name: `${contentType.collectionName}_entity_fk`,
+        columns: ["entity_id"]
+      },
+      {
+        name: `${contentType.collectionName}_unique`,
+        columns: ["entity_id", "component_id", "field", "component_type"],
+        type: "unique"
+      }
+    ],
+    foreignKeys: [
+      {
+        name: `${contentType.collectionName}_entity_fk`,
+        columns: ["entity_id"],
+        referencedColumns: ["id"],
+        referencedTable: contentType.collectionName,
+        onDelete: "CASCADE"
+      }
+    ]
+  };
+};
 const transformContentTypesToModels = (contentTypes) => {
-  return contentTypes.map((contentType) => {
+  const models = [];
+  contentTypes.forEach((contentType) => {
     const documentIdAttribute = contentType.modelType === "contentType" ? { documentId: { type: "string", default: createDocumentId } } : {};
-    const reservedAttributeNames = ["documentId", "document_id"];
+    const reservedAttributeNames = ["documentId", "document_id", "id"];
     reservedAttributeNames.forEach((reservedAttributeName) => {
       if (reservedAttributeName in contentType.attributes) {
         throw new Error(
@@ -26,22 +168,26 @@ const transformContentTypesToModels = (contentTypes) => {
         );
       }
     });
+    if (hasComponentsOrDz(contentType)) {
+      const compoLinkModel = createCompoLinkModel(contentType);
+      models.push(compoLinkModel);
+    }
+    assert(contentType.collectionName, "Collection name is required");
     const model = {
-      ...contentType,
-      // reuse new model def
+      uid: contentType.uid,
       singularName: contentType.modelName,
       tableName: contentType.collectionName,
       attributes: {
+        id: {
+          type: "increments"
+        },
         ...documentIdAttribute,
-        ...Object.keys(contentType.attributes || {}).reduce((attrs, attrName) => {
-          return Object.assign(attrs, {
-            [attrName]: transformAttribute(contentType.attributes[attrName])
-          });
-        }, {})
+        ...transformAttributes(contentType)
       }
     };
-    return model;
+    models.push(model);
   });
+  return models;
 };
 export {
   createDocumentId,

package/dist/utils/transform-content-types-to-models.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"transform-content-types-to-models.mjs","sources":["../../src/utils/transform-content-types-to-models.ts"],"sourcesContent":["import { DatabaseConfig } from '@strapi/database';\nimport { Schema, Attribute } from '@strapi/types';\nimport { createId } from '@paralleldrive/cuid2';\n\nconst transformAttribute = (attribute: Attribute.Any) => {\n  switch (attribute.type) {\n    case 'media': {\n      return {\n        type: 'relation',\n        relation: attribute.multiple === true ? 'morphMany' : 'morphOne',\n        target: 'plugin::upload.file',\n        morphBy: 'related',\n      };\n    }\n    default: {\n      return attribute;\n    }\n  }\n};\n\nexport const createDocumentId = createId;\n\nexport const transformContentTypesToModels = (\n  contentTypes: Pick<\n    Schema.ContentType,\n    'uid' | 'modelName' | 'collectionName' | 'attributes' | 'modelType'\n  >[]\n): DatabaseConfig['models'] => {\n  return contentTypes.map((contentType) => {\n    // Add document id to content types\n    // @ts-expect-error - `default` function is not typed into `Attribute`\n    // as it is not documented\n    const documentIdAttribute: Record<string, Attribute.Any> =\n      contentType.modelType === 'contentType'\n        ? { documentId: { type: 'string', default: createDocumentId } }\n        : {};\n\n    // Prevent user from creating a documentId attribute\n    const reservedAttributeNames = ['documentId', 'document_id'];\n    reservedAttributeNames.forEach((reservedAttributeName) => {\n      if (reservedAttributeName in contentType.attributes) {\n        throw new Error(\n          `The attribute \"${reservedAttributeName}\" is reserved and cannot be used in a model` +\n            `Please rename \"${contentType.modelName}\" attribute \"${reservedAttributeName}\" to something else.`\n        );\n      }\n    });\n\n    const model = {\n      ...contentType,\n      // reuse new model def\n      singularName: contentType.modelName,\n      tableName: contentType.collectionName!,\n      attributes: {\n        ...documentIdAttribute,\n        ...Object.keys(contentType.attributes! || {}).reduce((attrs, attrName) => {\n          return Object.assign(attrs, {\n            [attrName]: transformAttribute(contentType.attributes[attrName]!),\n          });\n        }, {}),\n      },\n    };\n\n    return model;\n  });\n};\n"],"names":[],"mappings":";AAIA,MAAM,qBAAqB,CAAC,cAA6B;AACvD,UAAQ,UAAU,MAAM;AAAA,IACtB,KAAK,SAAS;AACL,aAAA;AAAA,QACL,MAAM;AAAA,QACN,UAAU,UAAU,aAAa,OAAO,cAAc;AAAA,QACtD,QAAQ;AAAA,QACR,SAAS;AAAA,MAAA;AAAA,IAEb;AAAA,IACA,SAAS;AACA,aAAA;AAAA,IACT;AAAA,EACF;AACF;AAEO,MAAM,mBAAmB;AAEnB,MAAA,gCAAgC,CAC3C,iBAI6B;AACtB,SAAA,aAAa,IAAI,CAAC,gBAAgB;AAIvC,UAAM,sBACJ,YAAY,cAAc,gBACtB,EAAE,YAAY,EAAE,MAAM,UAAU,SAAS,iBAAiB,EAAA,IAC1D,CAAA;AAGA,UAAA,yBAAyB,CAAC,cAAc,aAAa;AACpC,2BAAA,QAAQ,CAAC,0BAA0B;AACpD,UAAA,yBAAyB,YAAY,YAAY;AACnD,cAAM,IAAI;AAAA,UACR,kBAAkB,qBAAqB,6DACnB,YAAY,SAAS,gBAAgB,qBAAqB;AAAA,QAAA;AAAA,MAElF;AAAA,IAAA,CACD;AAED,UAAM,QAAQ;AAAA,MACZ,GAAG;AAAA;AAAA,MAEH,cAAc,YAAY;AAAA,MAC1B,WAAW,YAAY;AAAA,MACvB,YAAY;AAAA,QACV,GAAG;AAAA,QACH,GAAG,OAAO,KAAK,YAAY,cAAe,CAAE,CAAA,EAAE,OAAO,CAAC,OAAO,aAAa;AACjE,iBAAA,OAAO,OAAO,OAAO;AAAA,YAC1B,CAAC,QAAQ,GAAG,mBAAmB,YAAY,WAAW,QAAQ,CAAE;AAAA,UAAA,CACjE;AAAA,QACH,GAAG,EAAE;AAAA,MACP;AAAA,IAAA;AAGK,WAAA;AAAA,EAAA,CACR;AACH;"}
+{"version":3,"file":"transform-content-types-to-models.mjs","sources":["../../src/utils/transform-content-types-to-models.ts"],"sourcesContent":["import { Model } from '@strapi/database';\nimport { Schema, Attribute } from '@strapi/types';\nimport { createId } from '@paralleldrive/cuid2';\nimport assert from 'node:assert';\n\nconst transformAttribute = (\n  name: string,\n  attribute: Attribute.Any,\n  contentType: Schema.ContentType\n) => {\n  switch (attribute.type) {\n    case 'media': {\n      return {\n        type: 'relation',\n        relation: attribute.multiple === true ? 'morphMany' : 'morphOne',\n        target: 'plugin::upload.file',\n        morphBy: 'related',\n      };\n    }\n    case 'component': {\n      return {\n        type: 'relation',\n        relation: attribute.repeatable === true ? 'oneToMany' : 'oneToOne',\n        target: attribute.component,\n\n        // We need the join table name to be deterministic,\n        // We need to allow passing the join table name as an option\n        joinTable: {\n          name: `${contentType.collectionName}_components`,\n          joinColumn: {\n            name: 'entity_id',\n            referencedColumn: 'id',\n          },\n          inverseJoinColumn: {\n            name: 'component_id',\n            referencedColumn: 'id',\n          },\n          on: {\n            field: name,\n          },\n          orderColumnName: 'order',\n          orderBy: {\n            order: 'asc',\n          },\n          pivotColumns: ['entity_id', 'component_id', 'field', 'component_type'],\n        },\n      };\n    }\n    case 'dynamiczone': {\n      return {\n        type: 'relation',\n        relation: 'morphToMany',\n        // TODO: handle restrictions at some point\n        // target: attribute.components,\n        joinTable: {\n          name: `${contentType.collectionName}_components`,\n          joinColumn: {\n            name: 'entity_id',\n            referencedColumn: 'id',\n          },\n          morphColumn: {\n            idColumn: {\n              name: 'component_id',\n              referencedColumn: 'id',\n            },\n            typeColumn: {\n              name: 'component_type',\n            },\n            typeField: '__component',\n          },\n          on: {\n            field: name,\n          },\n          orderBy: {\n            order: 'asc',\n          },\n          pivotColumns: ['entity_id', 'component_id', 'field', 'component_type'],\n        },\n      };\n    }\n    default: {\n      return attribute;\n    }\n  }\n};\n\nconst transformAttributes = (contentType: Schema.ContentType) => {\n  return Object.keys(contentType.attributes! || {}).reduce((attrs, attrName) => {\n    return {\n      ...attrs,\n      [attrName]: transformAttribute(attrName, contentType.attributes[attrName]!, contentType),\n    };\n  }, {});\n};\n\nconst hasComponentsOrDz = (contentType: Schema.ContentType) => {\n  return Object.values(contentType.attributes).some(\n    ({ type }) => type === 'dynamiczone' || type === 'component'\n  );\n};\n\nexport const createDocumentId = createId;\n\nconst createCompoLinkModel = (contentType: Schema.ContentType): Model => {\n  const name = `${contentType.collectionName}_components`;\n\n  return {\n    // TODO: make sure there can't be any conflicts with a prefix\n    singularName: name,\n    uid: name,\n    tableName: name,\n    attributes: {\n      id: {\n        type: 'increments',\n      },\n      entity_id: {\n        type: 'integer',\n        column: {\n          unsigned: true,\n        },\n      },\n      component_id: {\n        type: 'integer',\n        column: {\n          unsigned: true,\n        },\n      },\n      component_type: {\n        type: 'string',\n      },\n      field: {\n        type: 'string',\n      },\n      order: {\n        type: 'float',\n        column: {\n          unsigned: true,\n          defaultTo: null,\n        },\n      },\n    },\n    indexes: [\n      {\n        name: `${contentType.collectionName}_field_index`,\n        columns: ['field'],\n      },\n      {\n        name: `${contentType.collectionName}_component_type_index`,\n        columns: ['component_type'],\n      },\n      {\n        name: `${contentType.collectionName}_entity_fk`,\n        columns: ['entity_id'],\n      },\n      {\n        name: `${contentType.collectionName}_unique`,\n        columns: ['entity_id', 'component_id', 'field', 'component_type'],\n        type: 'unique',\n      },\n    ],\n    foreignKeys: [\n      {\n        name: `${contentType.collectionName}_entity_fk`,\n        columns: ['entity_id'],\n        referencedColumns: ['id'],\n        referencedTable: contentType.collectionName!,\n        onDelete: 'CASCADE',\n      },\n    ],\n  };\n};\n\nexport const transformContentTypesToModels = (contentTypes: Schema.ContentType[]): Model[] => {\n  const models: Model[] = [];\n\n  contentTypes.forEach((contentType) => {\n    // Add document id to content types\n    // as it is not documented\n    const documentIdAttribute: Record<string, Attribute.Any> =\n      contentType.modelType === 'contentType'\n        ? { documentId: { type: 'string', default: createDocumentId } }\n        : {};\n\n    // Prevent user from creating a documentId attribute\n    const reservedAttributeNames = ['documentId', 'document_id', 'id'];\n    reservedAttributeNames.forEach((reservedAttributeName) => {\n      if (reservedAttributeName in contentType.attributes) {\n        throw new Error(\n          `The attribute \"${reservedAttributeName}\" is reserved and cannot be used in a model` +\n            `Please rename \"${contentType.modelName}\" attribute \"${reservedAttributeName}\" to something else.`\n        );\n      }\n    });\n\n    if (hasComponentsOrDz(contentType)) {\n      const compoLinkModel = createCompoLinkModel(contentType);\n      models.push(compoLinkModel);\n    }\n\n    assert(contentType.collectionName, 'Collection name is required');\n\n    const model: Model = {\n      uid: contentType.uid,\n      singularName: contentType.modelName,\n      tableName: contentType.collectionName,\n      attributes: {\n        id: {\n          type: 'increments',\n        },\n        ...documentIdAttribute,\n        ...transformAttributes(contentType),\n      },\n    };\n\n    models.push(model);\n  });\n\n  return models;\n};\n"],"names":[],"mappings":"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"}

package/dist/utils/update-notifier/index.d.ts

@@ -1,9 +1,8 @@
 import type { Strapi } from '@strapi/types';
-declare const createUpdateNotifier: (strapi: Strapi) => {
+export declare const createUpdateNotifier: (strapi: Strapi) => {
     notify({ checkInterval, notifInterval }?: {
         checkInterval?: number | undefined;
         notifInterval?: number | undefined;
     }): void;
 };
-export default createUpdateNotifier;
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/update-notifier/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/update-notifier/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AA0B5C,QAAA,MAAM,oBAAoB,WAAY,MAAM;;;;;CA6D3C,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/update-notifier/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AA0B5C,eAAO,MAAM,oBAAoB,WAAY,MAAM;;;;;CAqElD,CAAC"}

package/dist/utils/update-notifier/index.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const path = require("path");
 const packageJson = require("package-json");
 const Configstore = require("configstore");
@@ -70,7 +71,12 @@ const createUpdateNotifier = (strapi) => {
   };
   return {
     notify({ checkInterval = CHECK_INTERVAL, notifInterval = NOTIF_INTERVAL } = {}) {
-      if (strapiUtils.env.bool("STRAPI_DISABLE_UPDATE_NOTIFICATION", false) || !config) {
+      if (strapiUtils.env.bool("STRAPI_DISABLE_UPDATE_NOTIFICATION", false)) {
+        strapi.log.warn(
+          "STRAPI_DISABLE_UPDATE_NOTIFICATION is no longer supported. Instead, set logger.updates.enabled to false in your server configuration."
+        );
+      }
+      if (!strapi.config.get("server.logger.updates.enabled") || !config) {
         return;
       }
       display(notifInterval);
@@ -78,5 +84,5 @@ const createUpdateNotifier = (strapi) => {
     }
   };
 };
-module.exports = createUpdateNotifier;
+exports.createUpdateNotifier = createUpdateNotifier;
 //# sourceMappingURL=index.js.map