@xleddyl/nuxt-cms 0.4.0 → 0.4.2

package/dist/module.json

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

package/dist/module.mjs

@@ -1017,12 +1017,8 @@ function blockTypesTs(entryName, key, field) {
     members.push(name);
     const lines = [];
     for (const [blockFieldKey, blockField] of Object.entries(block.fields)) {
-      if (blockField.type === "media") {
-        lines.push(`  ${blockFieldKey}: ${mediaTsType(blockField)} | null`);
-        continue;
-      }
-      const base = scalarTsType(blockField);
-      lines.push(`  ${blockFieldKey}: ${blockField.required ? base : `${base} | null`}`);
+      const base = blockField.type === "media" ? mediaTsType(blockField) : scalarTsType(blockField);
+      lines.push(`  ${blockFieldKey}: ${base} | null`);
     }
     defs.push(`export interface ${props} {
 ${lines.join("\n")}
@@ -1643,13 +1639,9 @@ const module$1 = defineNuxtModule({
         `  dialect: '${dialect}',`,
         `  schema: '${toPosix(schemaTemplate.dst)}',`,
         `  out: '${toPosix(relativeMigrationsDir)}',`,
-        driver === "postgres" ? `  dbCredentials: { url: process.env.NUXT_CMS_DATABASE_URL ?? ${JSON.stringify(
-          databaseUrl
-        )} },` : driver === "libsql" ? `  dbCredentials: { url: process.env.NUXT_CMS_DATABASE_URL ?? ${JSON.stringify(
-          databaseUrl || `file:${toPosix(resolvedDbPath)}`
-        )}, authToken: (process.env.NUXT_CMS_DATABASE_AUTH_TOKEN ?? ${JSON.stringify(
-          databaseAuthToken
-        )}) || undefined },` : driver === "d1" ? `` : `  dbCredentials: { url: ${JSON.stringify(toPosix(resolvedDbPath))} },`,
+        driver === "postgres" ? `  dbCredentials: { url: process.env.NUXT_CMS_DATABASE_URL },` : driver === "libsql" ? databaseUrl ? `  dbCredentials: { url: process.env.NUXT_CMS_DATABASE_URL, authToken: process.env.NUXT_CMS_DATABASE_AUTH_TOKEN || undefined },` : `  dbCredentials: { url: ${JSON.stringify(
+          `file:${toPosix(resolvedDbPath)}`
+        )} },` : driver === "d1" ? `` : `  dbCredentials: { url: ${JSON.stringify(toPosix(resolvedDbPath))} },`,
         `}`,
         ``
       ].join("\n")

package/dist/runtime/shared/graphql-sdl.js

@@ -80,8 +80,7 @@ ${lines.join("\n")}
 }`;
 }
 function blockFieldSdl(field) {
-  if (field.type === "media") return { base: "CmsMedia", nonNull: false };
-  return { base: scalarFor(field), nonNull: !!field.required };
+  return field.type === "media" ? "CmsMedia" : scalarFor(field);
 }
 function sharedBlockFieldsSdl(field) {
   const blocks = Object.values(field.blocks ?? {});
@@ -92,9 +91,8 @@ function sharedBlockFieldsSdl(field) {
     const rendered = blocks.map((block) => block.fields[key]);
     if (rendered.some((blockField) => !blockField)) continue;
     const types = rendered.map((blockField) => blockFieldSdl(blockField));
-    if (types.some((type) => type.base !== types[0].base)) continue;
-    const nonNull = types.every((type) => type.nonNull);
-    lines.push(`  ${key}: ${types[0].base}${nonNull ? "!" : ""}`);
+    if (types.some((type) => type !== types[0])) continue;
+    lines.push(`  ${key}: ${types[0]}`);
   }
   return lines;
 }
@@ -109,8 +107,7 @@ ${shared.join("\n")}
   for (const [blockName, block] of blocks) {
     const lines = ["  type: String!"];
     for (const [blockFieldKey, blockField] of Object.entries(block.fields)) {
-      const type = blockFieldSdl(blockField);
-      lines.push(`  ${blockFieldKey}: ${type.base}${type.nonNull ? "!" : ""}`);
+      lines.push(`  ${blockFieldKey}: ${blockFieldSdl(blockField)}`);
     }
     const gqlType = blockTypeName(name, key, blockName);
     defs.push(`type ${gqlType} implements ${interfaceName} {

package/package.json

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