@majordigital/create-acorn 1.5.2 → 1.5.5

package/bin/create-acorn.mjs

@@ -335,11 +335,21 @@ async function setupStoryblok(projectName) {
   console.log('');
 }
 
-async function setupDato(projectName) {
+async function setupDato() {
   console.log('Setting up DatoCMS...');
   console.log('');
+  console.log('NOTE: DatoCMS does not support creating projects via CLI or API.');
+  console.log('You must create your DatoCMS project in the dashboard before continuing:');
+  console.log('  https://www.datocms.com/dashboard');
+  console.log('');
+  console.log('Once your project is ready, provide the Full-access API token below');
+  console.log('and we will automatically scaffold all models (Page, Hero, Button, Layout, etc.).');
+  console.log('');
+  console.log('Token location: Settings > API Tokens > Full-access API token');
+  console.log('Make sure "Access the Content Management API" is enabled and the role is Admin.');
+  console.log('');
 
-  const datoProjectName = await ask('Enter your DatoCMS project name', projectName);
+  const apiToken = await ask('Paste your Full-access API token (or press Enter to skip)');
   console.log('');
 
   // Install DatoCMS dependencies
@@ -356,33 +366,6 @@ async function setupDato(projectName) {
   ]);
   console.log('');
 
-  // --- DatoCMS Project Connection & Model Scaffolding ---
-  const hasExisting = await ask('Do you already have a DatoCMS project? (y/n)', 'n');
-  const isExisting = hasExisting.toLowerCase() === 'y' || hasExisting.toLowerCase() === 'yes';
-
-  if (!isExisting) {
-    console.log('');
-    console.log('NOTE: DatoCMS does not support creating projects via CLI or API.');
-    console.log('You need to create the project manually first:');
-    console.log('');
-    console.log('  1. Go to https://www.datocms.com/dashboard');
-    console.log('  2. Click "New Project" and create your project');
-    console.log('  3. Go to Settings > API Tokens > Full-access API token');
-    console.log('  4. Copy the token and paste it below');
-    console.log('');
-    console.log('If you provide the token, we will automatically scaffold all models');
-    console.log('(Page, Hero, Button, Layout, etc.) in your DatoCMS project.');
-    console.log('');
-  } else {
-    console.log('');
-    console.log('Great! We can automatically scaffold all models in your project.');
-    console.log('Grab your Full-access API token from:');
-    console.log('  Settings > API Tokens > Full-access API token');
-    console.log('');
-  }
-
-  const apiToken = await ask('Paste your Full-access API token (or press Enter to skip)');
-
   if (apiToken) {
     console.log('');
     console.log('Scaffolding DatoCMS models...');
@@ -571,22 +554,41 @@ async function scaffoldDatoModels(apiToken) {
   const { buildClient } = await import('@datocms/cma-client-node');
   const client = buildClient({ apiToken });
 
+  // Fetch existing models so we can skip duplicates (handles re-runs)
+  const existingTypes = await client.itemTypes.list();
+  const existingKeys = new Set(existingTypes.map(t => t.api_key));
+
+  async function findOrCreateItemType(config) {
+    if (existingKeys.has(config.api_key)) {
+      console.log(`  Skipping ${config.name} (already exists)...`);
+      return existingTypes.find(t => t.api_key === config.api_key);
+    }
+    return client.itemTypes.create(config);
+  }
+
+  async function findOrCreateField(modelId, config) {
+    const existingFields = await client.fields.list(modelId);
+    const existing = existingFields.find(f => f.api_key === config.api_key);
+    if (existing) return existing;
+    return client.fields.create(modelId, config);
+  }
+
   // --- Block models (must be created first so we can reference them) ---
 
   // Button block
   console.log('  Creating Button block...');
-  const buttonBlock = await client.itemTypes.create({
+  const buttonBlock = await findOrCreateItemType({
     name: 'Button',
     api_key: 'button',
     modular_block: true,
   });
-  await client.fields.create(buttonBlock.id, {
+  await findOrCreateField(buttonBlock.id, {
     label: 'Text',
     field_type: 'string',
     api_key: 'text',
     validators: { required: {} },
   });
-  await client.fields.create(buttonBlock.id, {
+  await findOrCreateField(buttonBlock.id, {
     label: 'Variant',
     field_type: 'string',
     api_key: 'variant',
@@ -601,7 +603,7 @@ async function scaffoldDatoModels(apiToken) {
       ]},
     },
   });
-  await client.fields.create(buttonBlock.id, {
+  await findOrCreateField(buttonBlock.id, {
     label: 'Link',
     field_type: 'json',
     api_key: 'link',
@@ -609,23 +611,23 @@ async function scaffoldDatoModels(apiToken) {
 
   // Hero block
   console.log('  Creating Hero block...');
-  const heroBlock = await client.itemTypes.create({
+  const heroBlock = await findOrCreateItemType({
     name: 'Hero',
     api_key: 'hero',
     modular_block: true,
   });
-  await client.fields.create(heroBlock.id, {
+  await findOrCreateField(heroBlock.id, {
     label: 'Heading',
     field_type: 'string',
     api_key: 'heading',
     validators: { required: {} },
   });
-  await client.fields.create(heroBlock.id, {
+  await findOrCreateField(heroBlock.id, {
     label: 'Eyebrow',
     field_type: 'string',
     api_key: 'eyebrow',
   });
-  await client.fields.create(heroBlock.id, {
+  await findOrCreateField(heroBlock.id, {
     label: 'Content',
     field_type: 'text',
     api_key: 'content',
@@ -635,7 +637,7 @@ async function scaffoldDatoModels(apiToken) {
       parameters: {},
     },
   });
-  await client.fields.create(heroBlock.id, {
+  await findOrCreateField(heroBlock.id, {
     label: 'Layout',
     field_type: 'string',
     api_key: 'layout',
@@ -650,7 +652,7 @@ async function scaffoldDatoModels(apiToken) {
       ]},
     },
   });
-  await client.fields.create(heroBlock.id, {
+  await findOrCreateField(heroBlock.id, {
     label: 'Theme',
     field_type: 'string',
     api_key: 'theme',
@@ -664,12 +666,12 @@ async function scaffoldDatoModels(apiToken) {
       ]},
     },
   });
-  await client.fields.create(heroBlock.id, {
+  await findOrCreateField(heroBlock.id, {
     label: 'Image',
     field_type: 'file',
     api_key: 'image',
   });
-  await client.fields.create(heroBlock.id, {
+  await findOrCreateField(heroBlock.id, {
     label: 'Actions',
     field_type: 'rich_text',
     api_key: 'actions',
@@ -680,12 +682,12 @@ async function scaffoldDatoModels(apiToken) {
 
   // MenuItem block
   console.log('  Creating MenuItem block...');
-  const menuItemBlock = await client.itemTypes.create({
+  const menuItemBlock = await findOrCreateItemType({
     name: 'Menu Item',
     api_key: 'menu_item',
     modular_block: true,
   });
-  await client.fields.create(menuItemBlock.id, {
+  await findOrCreateField(menuItemBlock.id, {
     label: 'Heading',
     field_type: 'string',
     api_key: 'heading',
@@ -696,40 +698,40 @@ async function scaffoldDatoModels(apiToken) {
 
   // Page model
   console.log('  Creating Page model...');
-  const pageModel = await client.itemTypes.create({
+  const pageModel = await findOrCreateItemType({
     name: 'Page',
     api_key: 'page',
     draft_mode_active: true,
   });
-  await client.fields.create(pageModel.id, {
+  const pageHeadingField = await findOrCreateField(pageModel.id, {
     label: 'Heading',
     field_type: 'string',
     api_key: 'heading',
     validators: { required: {} },
   });
-  await client.fields.create(pageModel.id, {
+  await findOrCreateField(pageModel.id, {
     label: 'Description',
     field_type: 'text',
     api_key: 'description',
   });
-  await client.fields.create(pageModel.id, {
+  await findOrCreateField(pageModel.id, {
     label: 'Slug',
     field_type: 'slug',
     api_key: 'slug',
     validators: {
       required: {},
-      slug_title_field: { title_field_id: (await client.fields.list(pageModel.id)).find(f => f.api_key === 'heading').id },
+      slug_title_field: { title_field_id: pageHeadingField.id },
     },
   });
-  await client.fields.create(pageModel.id, {
+  await findOrCreateField(pageModel.id, {
     label: 'Parent Page',
     field_type: 'link',
     api_key: 'parent_page',
     validators: {
-      item_item_type: { on_publish_with_unpublished_references_strategy: 'fail', on_reference_unpublish_strategy: 'fail', on_reference_delete_strategy: 'set_null', item_types: [pageModel.id] },
+      item_item_type: { item_types: [pageModel.id] },
     },
   });
-  await client.fields.create(pageModel.id, {
+  await findOrCreateField(pageModel.id, {
     label: 'Body',
     field_type: 'rich_text',
     api_key: 'body',
@@ -739,61 +741,61 @@ async function scaffoldDatoModels(apiToken) {
   });
 
   // Add target link to MenuItem (now that Page exists)
-  await client.fields.create(menuItemBlock.id, {
+  await findOrCreateField(menuItemBlock.id, {
     label: 'Target',
     field_type: 'link',
     api_key: 'target',
     validators: {
-      item_item_type: { on_publish_with_unpublished_references_strategy: 'fail', on_reference_unpublish_strategy: 'fail', on_reference_delete_strategy: 'set_null', item_types: [pageModel.id] },
+      item_item_type: { item_types: [pageModel.id] },
     },
   });
 
   // Case Study model
   console.log('  Creating Case Study model...');
-  const caseStudyModel = await client.itemTypes.create({
+  const caseStudyModel = await findOrCreateItemType({
     name: 'Case Study',
     api_key: 'case_study',
     draft_mode_active: true,
   });
-  await client.fields.create(caseStudyModel.id, {
+  const caseStudyTitleField = await findOrCreateField(caseStudyModel.id, {
     label: 'Title',
     field_type: 'string',
     api_key: 'title',
     validators: { required: {} },
   });
-  await client.fields.create(caseStudyModel.id, {
+  await findOrCreateField(caseStudyModel.id, {
     label: 'Slug',
     field_type: 'slug',
     api_key: 'slug',
     validators: {
       required: {},
-      slug_title_field: { title_field_id: (await client.fields.list(caseStudyModel.id)).find(f => f.api_key === 'title').id },
+      slug_title_field: { title_field_id: caseStudyTitleField.id },
     },
   });
 
   // Legal Page model
   console.log('  Creating Legal Page model...');
-  const legalPageModel = await client.itemTypes.create({
+  const legalPageModel = await findOrCreateItemType({
     name: 'Legal Page',
     api_key: 'legal_page',
     draft_mode_active: true,
   });
-  await client.fields.create(legalPageModel.id, {
+  const legalTitleField = await findOrCreateField(legalPageModel.id, {
     label: 'Title',
     field_type: 'string',
     api_key: 'title',
     validators: { required: {} },
   });
-  await client.fields.create(legalPageModel.id, {
+  await findOrCreateField(legalPageModel.id, {
     label: 'Slug',
     field_type: 'slug',
     api_key: 'slug',
     validators: {
       required: {},
-      slug_title_field: { title_field_id: (await client.fields.list(legalPageModel.id)).find(f => f.api_key === 'title').id },
+      slug_title_field: { title_field_id: legalTitleField.id },
     },
   });
-  await client.fields.create(legalPageModel.id, {
+  await findOrCreateField(legalPageModel.id, {
     label: 'Download',
     field_type: 'file',
     api_key: 'download',
@@ -801,35 +803,35 @@ async function scaffoldDatoModels(apiToken) {
 
   // Post model
   console.log('  Creating Post model...');
-  const postModel = await client.itemTypes.create({
+  const postModel = await findOrCreateItemType({
     name: 'Post',
     api_key: 'post',
     draft_mode_active: true,
   });
-  await client.fields.create(postModel.id, {
+  const postTitleField = await findOrCreateField(postModel.id, {
     label: 'Title',
     field_type: 'string',
     api_key: 'title',
     validators: { required: {} },
   });
-  await client.fields.create(postModel.id, {
+  await findOrCreateField(postModel.id, {
     label: 'Slug',
     field_type: 'slug',
     api_key: 'slug',
     validators: {
       required: {},
-      slug_title_field: { title_field_id: (await client.fields.list(postModel.id)).find(f => f.api_key === 'title').id },
+      slug_title_field: { title_field_id: postTitleField.id },
     },
   });
 
   // Case Studies Listing (singleton)
   console.log('  Creating Case Studies Listing singleton...');
-  const caseStudiesListing = await client.itemTypes.create({
+  const caseStudiesListing = await findOrCreateItemType({
     name: 'Case Studies Listing',
     api_key: 'case_studies_listing',
     singleton: true,
   });
-  await client.fields.create(caseStudiesListing.id, {
+  await findOrCreateField(caseStudiesListing.id, {
     label: 'Slug',
     field_type: 'string',
     api_key: 'slug',
@@ -838,12 +840,12 @@ async function scaffoldDatoModels(apiToken) {
 
   // Post Listing (singleton)
   console.log('  Creating Post Listing singleton...');
-  const postListing = await client.itemTypes.create({
+  const postListing = await findOrCreateItemType({
     name: 'Post Listing',
     api_key: 'post_listing',
     singleton: true,
   });
-  await client.fields.create(postListing.id, {
+  await findOrCreateField(postListing.id, {
     label: 'Slug',
     field_type: 'string',
     api_key: 'slug',
@@ -852,12 +854,12 @@ async function scaffoldDatoModels(apiToken) {
 
   // Layout (singleton)
   console.log('  Creating Layout singleton...');
-  const layoutModel = await client.itemTypes.create({
+  const layoutModel = await findOrCreateItemType({
     name: 'Layout',
     api_key: 'layout',
     singleton: true,
   });
-  await client.fields.create(layoutModel.id, {
+  await findOrCreateField(layoutModel.id, {
     label: 'Navigation',
     field_type: 'rich_text',
     api_key: 'navigation',
@@ -865,7 +867,7 @@ async function scaffoldDatoModels(apiToken) {
       rich_text_blocks: { item_types: [menuItemBlock.id] },
     },
   });
-  await client.fields.create(layoutModel.id, {
+  await findOrCreateField(layoutModel.id, {
     label: 'Footer Navigation',
     field_type: 'rich_text',
     api_key: 'footer_navigation',
@@ -873,7 +875,7 @@ async function scaffoldDatoModels(apiToken) {
       rich_text_blocks: { item_types: [menuItemBlock.id] },
     },
   });
-  await client.fields.create(layoutModel.id, {
+  await findOrCreateField(layoutModel.id, {
     label: 'Copyright',
     field_type: 'string',
     api_key: 'copyright',
@@ -1125,7 +1127,7 @@ NEXT_PUBLIC_SITE_URL=
   } else if (selection.key === 'storyblok') {
     await setupStoryblok(projectDir);
   } else if (selection.key === 'dato') {
-    await setupDato(projectDir);
+    await setupDato();
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@majordigital/create-acorn",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "description": "Interactive scaffold for Acorn with Storyblok/Prismic/DatoCMS, TypeScript, and Tailwind.",
   "bin": {
     "create-acorn": "bin/create-acorn.mjs",