@xleddyl/nuxt-cms 0.8.1 → 0.8.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@xleddyl/nuxt-cms",
   "configKey": "cms",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/module.mjs

@@ -9,7 +9,7 @@ import { minifyIntrospection, outputIntrospectionFile } from 'gql.tada/internal'
 import { createJiti } from 'jiti';
 import { typeName, blockTypeName as blockTypeName$1, blocksFieldTypeName, renderGraphqlSdl } from '../dist/runtime/shared/graphql-sdl.js';
 import { migrationsDirFor } from '../dist/runtime/shared/migrations-dir.js';
-import { entryFieldsFor, isPrivateField, blockTypeName, pageColumnFields, isTranslatableField, isTranslatableMediaField, isStringListField, pageAllFields, normalizeContentEntries, PAGE_PATH_FIELD, pageRoutes, isCollectionKind, isMultiSelect, layoutErrors, listErrors, mobileMediaKey, fieldConditions, selectOptionValues, CONTENT_SLUG_FIELD, pageFieldsTableName, pageMediaTableName, CONTENT_SYSTEM_FIELDS, isRequiredField, pageFields, mediaTypeFilter, DEFAULT_MEDIA_MAX_FILE_SIZE, normalizeCmsConfig } from '../dist/runtime/shared/index.js';
+import { entryFieldsFor, isPrivateField, blockTypeName, pageColumnFields, isTranslatableField, isTranslatableMediaField, isStringListField, pageAllFields, normalizeContentEntries, PAGE_PATH_FIELD, pageRoutes, isCollectionKind, isMultiSelect, layoutErrors, listErrors, mobileMediaKey, fieldConditions, selectOptionValues, pageFieldsTableName, pageMediaTableName, CONTENT_SYSTEM_FIELDS, isRequiredField, pageFields, mediaTypeFilter, DEFAULT_MEDIA_MAX_FILE_SIZE, normalizeCmsConfig } from '../dist/runtime/shared/index.js';
 import { previewPathErrors, DEFAULT_CMS_PREVIEW_PATH } from '../dist/runtime/shared/preview.js';
 import { scanMediaDirectory, readMediaFileMeta } from '../dist/runtime/server/utils/media-sync.js';
 import { createHash } from 'node:crypto';
@@ -482,8 +482,6 @@ function validateConfig(config, i18n) {
         if (!source) errors.push(`${fat}: slug source '${field.from}' is not a declared field`);
         else if (source.type !== "text")
           errors.push(`${fat}: slug source '${field.from}' must be a text field`);
-        else if (isTranslatableField(source) && !(entry.kind === "content" && key === CONTENT_SLUG_FIELD))
-          errors.push(`${fat}: slug source '${field.from}' cannot be translatable`);
       }
       if (field.type === "tags") {
         errors.push(...tagsOptionErrors(fat, field));
@@ -761,9 +759,8 @@ function columnExpr(key, field, dialect, table) {
       expr = `text('${col}').unique()`;
       break;
     case "relation": {
-      const onDelete = field.onDelete ?? (field.required ? "restrict" : "set null");
-      const target = field.to === table ? `(): ${anyColumnType(dialect)}` : "()";
-      expr = `text('${col}').references(${target} => ${field.to}.id, { onDelete: '${onDelete}' })`;
+      const onDelete = relationOnDelete(field);
+      expr = field.to === table ? `text('${col}')` : `text('${col}').references(() => ${field.to}.id, { onDelete: '${onDelete}' })`;
       if (field.cardinality === "one-to-one") expr += ".unique()";
       break;
     }
@@ -773,8 +770,8 @@ function columnExpr(key, field, dialect, table) {
   if (isRequiredField(field)) expr += ".notNull()";
   return `  ${key}: ${expr},`;
 }
-function anyColumnType(dialect) {
-  return dialect === "postgres" ? "AnyPgColumn" : "AnySQLiteColumn";
+function relationOnDelete(field) {
+  return field.onDelete ?? (field.required ? "restrict" : "set null");
 }
 function isSelfRelation(table, field) {
   return field.type === "relation" && !isManyToMany(field) && field.to === table;
@@ -792,6 +789,7 @@ function tableExpr(name, entry, dialect) {
   const pg = dialect === "postgres";
   const tableFn = pg ? "pgTable" : "sqliteTable";
   const lines = [];
+  const selfReferences = [];
   lines.push(`  id: text('id').primaryKey(),`);
   if (entry.kind === "page") lines.push(`  path: text('path').notNull().unique(),`);
   for (const [key, field] of Object.entries(
@@ -799,13 +797,22 @@ function tableExpr(name, entry, dialect) {
   )) {
     if (isManyToMany(field)) continue;
     lines.push(columnExpr(key, field, dialect, name));
+    if (isSelfRelation(name, field))
+      selfReferences.push(
+        `foreignKey({ columns: [table.${key}], foreignColumns: [table.id] }).onDelete('${relationOnDelete(
+          field
+        )}')`
+      );
   }
   if (entry.drafts) lines.push(`  status: text('status').notNull().default('draft'),`);
   if (isCollectionKind(entry)) lines.push(`  createdAt: ${nowExpr(pg, "created_at")},`);
   lines.push(`  updatedAt: ${nowExpr(pg, "updated_at")},`);
+  const extra = selfReferences.length ? `, table => [
+  ${selfReferences.join(",\n  ")},
+]` : "";
   return `export const ${name} = ${tableFn}('${name}', {
 ${lines.join("\n")}
-})`;
+}${extra})`;
 }
 function joinTableExpr(name, key, field, dialect) {
   const pg = dialect === "postgres";
@@ -888,18 +895,14 @@ function renderSchemaFile(config, dialect, resolveImport = (s) => s) {
     core.add("jsonb");
   if (pg) core.add("timestamp");
   if (fields.some(isManyToMany) || rowsEntries.length) core.add("primaryKey");
-  const hasSelfRelation = derived.some(
+  if (derived.some(
     ([name, entry]) => Object.values(entry.kind === "page" ? pageColumnFields(entry) : entry.fields).some(
       (field) => isSelfRelation(name, field)
     )
-  );
+  ))
+    core.add("foreignKey");
   const imports = [
     ...pg ? [] : [`import { sql } from '${resolveImport("drizzle-orm")}'`],
-    ...hasSelfRelation ? [
-      `import type { ${anyColumnType(dialect)} } from '${resolveImport(
-        `drizzle-orm/${pg ? "pg-core" : "sqlite-core"}`
-      )}'`
-    ] : [],
     `import { ${[...core].sort().join(", ")} } from '${resolveImport(
       `drizzle-orm/${pg ? "pg-core" : "sqlite-core"}`
     )}'`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xleddyl/nuxt-cms",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Lightweight CMS that ships with your Nuxt app: runs on the Nitro server, content types defined in code, /cms admin panel, GraphQL API, SQLite or Postgres. No external CMS needed!",
   "license": "MIT",
   "author": "Edoardo Alberti (https://github.com/xleddyl)",