@xleddyl/nuxt-cms 0.8.0 → 0.8.2

package/dist/module.json

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

package/dist/module.mjs

@@ -2,14 +2,14 @@ import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { extname, resolve, isAbsolute, join, relative, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { defineNuxtModule, createResolver, useLogger, addImports, addTemplate, addServerPlugin, addTypeTemplate, addComponentsDir, addRouteMiddleware, extendPages, addServerHandler, resolvePath, addComponent } from '@nuxt/kit';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+import { defineNuxtModule, createResolver, useLogger, addImports, addTemplate, addServerPlugin, addTypeTemplate, addComponentsDir, tryResolveModule, addRouteMiddleware, extendPages, addServerHandler, resolvePath, addComponent } from '@nuxt/kit';
 import { introspectionFromSchema, buildSchema } from 'graphql';
 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"}`
     )}'`
@@ -1548,6 +1551,9 @@ const module$1 = defineNuxtModule({
     "nuxt-auth-utils": {},
     "@xleddyl/443-components-vue/nuxt": {
       defaults: {
+        composables: false,
+        css: false,
+        fonts: false,
         editor: true,
         icons: {
           collections: [
@@ -1918,11 +1924,6 @@ const module$1 = defineNuxtModule({
       getContents: () => renderBrandFile(resolveBrand(resolved.admin, brandPaths).brand)
     });
     nuxt.options.alias["#cms-brand"] = brandTemplate.dst;
-    nuxt.options.css.push(
-      resolveImport("@fontsource-variable/geist/index.css"),
-      resolveImport("@fontsource-variable/geist-mono/index.css"),
-      resolver.resolve("./runtime/assets/cms.css")
-    );
     nuxt.hook("app:templates", (app) => {
       app.layouts["cms-admin"] = {
         name: "cms-admin",
@@ -1934,6 +1935,23 @@ const module$1 = defineNuxtModule({
       };
     });
     addComponentsDir({ path: resolver.resolve("./runtime/app/components") });
+    nuxt.hook("app:resolve", (app) => {
+      app.plugins = app.plugins.filter(
+        (plugin) => !/[\\/]443-components-vue[\\/]dist[\\/]nuxt[\\/]runtime[\\/](theme|locale)(\.mjs)?$/.test(
+          plugin.src
+        )
+      );
+    });
+    nuxt.hook("modules:done", async () => {
+      const include = nuxt.options.vite.optimizeDeps?.include;
+      if (!include) return;
+      const rootUrl = pathToFileURL(`${nuxt.options.rootDir}/`).href;
+      nuxt.options.vite.optimizeDeps.include = await Promise.all(
+        include.map(
+          async (entry) => entry.startsWith("@tiptap/") && !await tryResolveModule(entry, rootUrl) ? `@xleddyl/nuxt-cms > ${entry}` : entry
+        )
+      );
+    });
     addRouteMiddleware({
       name: "cms-auth",
       path: resolver.resolve("./runtime/app/middleware/cms-auth")

package/dist/runtime/app/layouts/cms-admin.vue

@@ -223,3 +223,7 @@ async function logout() {
   await navigateTo("/cms/login");
 }
 </script>
+
+<style src="../../assets/admin.css">
+
+</style>

package/dist/runtime/app/layouts/cms-editor.vue

@@ -17,3 +17,7 @@ const theme = useCmsTheme();
 provideTheme(theme);
 await loadCmsSettings();
 </script>
+
+<style src="../../assets/admin.css">
+
+</style>

package/dist/runtime/app/pages/admin-login.vue

@@ -75,3 +75,7 @@ async function login(values) {
   }
 }
 </script>
+
+<style src="../../assets/admin.css">
+
+</style>

package/dist/runtime/assets/admin.css

@@ -0,0 +1 @@
+@layer theme, base, k, components, utilities;@import "@xleddyl/443-components-vue/style.css";@import "@xleddyl/443-components-vue/editor/style.css";@import "@fontsource-variable/geist/index.css";@import "@fontsource-variable/geist-mono/index.css";@import "./cms.css";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xleddyl/nuxt-cms",
-  "version": "0.8.0",
+  "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)",