@jungvonmatt/contentful-fakes 1.4.0 → 1.4.8

package/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.8](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.7...v1.4.8) (2022-02-09)
+
+**Note:** Version bump only for package @jungvonmatt/contentful-fakes
+
+
+
+
+
+## [1.4.5](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.4...v1.4.5) (2022-01-31)
+
+**Note:** Version bump only for package @jungvonmatt/contentful-fakes
+
+
+
+
+
+## [1.4.2](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.1...v1.4.2) (2022-01-20)
+
+
+### Bug Fixes
+
+* 🐛 Don't ask for delivery & preview token ([10a9a74](https://github.com/jungvonmatt/contentful-ssg/commit/10a9a74f24fecca9d8866d39e2ca9095e9a4d638))
+* 🐛 lint ([22c8b38](https://github.com/jungvonmatt/contentful-ssg/commit/22c8b38fbe1f62e20a597545808181fc488d04c6))
+
+
+
+
+
+## [1.4.1](https://github.com/jungvonmatt/contentful-ssg/compare/v1.4.0...v1.4.1) (2022-01-20)
+
+**Note:** Version bump only for package @jungvonmatt/contentful-fakes
+
+
+
+
+
 # [1.4.0](https://github.com/jungvonmatt/contentful-ssg/compare/v1.3.2...v1.4.0) (2022-01-19)
 
 

package/dist/cli.js

@@ -1,22 +1,17 @@
 #!/usr/bin/env node
-import path from 'path';
-import { existsSync } from 'fs';
-import { outputFile } from 'fs-extra';
+import { stringify } from '@jungvonmatt/contentful-ssg/converter';
+import { forEachAsync } from '@jungvonmatt/contentful-ssg/lib/array';
+import { confirm, logError } from '@jungvonmatt/contentful-ssg/lib/ui';
+import chalk from 'chalk';
 import { Command } from 'commander';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
-import { getConfig } from '@jungvonmatt/contentful-ssg/lib/config';
-import { forEachAsync } from '@jungvonmatt/contentful-ssg/lib/array';
-import { stringify } from '@jungvonmatt/contentful-ssg/converter';
-import { logError, askMissing, confirm } from '@jungvonmatt/contentful-ssg/lib/ui';
+import { existsSync } from 'fs';
+import { outputFile } from 'fs-extra';
+import path from 'path';
 import { createFakes } from './index.js';
 const env = dotenv.config();
 dotenvExpand(env);
-const parseArgs = (cmd) => ({
-    environment: cmd.env,
-    verbose: Boolean(cmd.verbose),
-    contentTypes: cmd.contentType,
-});
 const errorHandler = (error, silence) => {
     if (!silence) {
         const { errors } = error;
@@ -35,29 +30,32 @@ program
     .option('-c, --content-type <content-type...>', 'Specify content-types')
     .option('-e, --extension <extension>', 'Specify output format', 'yaml')
     .option('-o, --output-directory <directory>', 'Specify output directory', 'data')
-    .option('-f, --force', 'Overwrite')
+    .option('--yes', 'Overwrite')
+    .option('--no', 'Skip')
     .action(actionRunner(async (cmd) => {
     const contentTypes = cmd?.contentType ?? [];
-    const force = cmd?.force ?? false;
+    const yes = cmd?.yes ?? false;
+    const no = cmd?.no ?? false;
     const format = cmd?.extension ?? '';
     const outputDirectory = cmd?.outputDirectory ?? '';
-    const config = await getConfig(parseArgs(cmd));
-    const verified = await askMissing(config);
-    const fakes = await createFakes(verified, contentTypes);
+    const fakes = await createFakes(contentTypes);
+    console.log();
+    if (!Object.keys(fakes).length) {
+        console.log('No files generated.');
+        console.log(`No content models found for: ${chalk.cyan(contentTypes.join(chalk.white(', ')))}`);
+    }
     await forEachAsync(Object.entries(fakes), async ([contentTypeId, fakeData]) => {
-        const [defaultData, minData] = fakeData;
+        const [defaultData] = fakeData;
         const dir = path.join(outputDirectory, contentTypeId);
         const filenameDefault = path.join(dir, `default.${format}`);
-        const filenameMin = path.join(dir, `min.${format}`);
-        if (!existsSync(filenameDefault) ||
-            force ||
+        if (existsSync(filenameDefault) && no) {
+            console.log(chalk.yellow(`  skipped: ${filenameDefault}`));
+        }
+        else if (!existsSync(filenameDefault) ||
+            yes ||
             (await confirm(`Overwrite file: ${filenameDefault}`))) {
             await outputFile(filenameDefault, stringify(defaultData, format));
-        }
-        if (!existsSync(filenameMin) ||
-            force ||
-            (await confirm(`Overwrite file: ${filenameMin}`))) {
-            await outputFile(filenameMin, stringify(minData, format));
+            console.log(chalk.green(`    added: ${filenameDefault}`));
         }
     });
 }));

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { ContentfulConfig, KeyValueMap } from '@jungvonmatt/contentful-ssg';
-export declare function createFakes(config: ContentfulConfig, contentTypeIds: string[]): Promise<Record<string, KeyValueMap[]>>;
+import { KeyValueMap } from '@jungvonmatt/contentful-ssg';
+export declare function createFakes(contentTypeIds: string[]): Promise<Record<string, KeyValueMap[]>>;

package/dist/index.js

@@ -1,7 +1,13 @@
 import { getEnvironment } from '@jungvonmatt/contentful-ssg/lib/contentful';
+import { getConfig } from '@jungvonmatt/contentful-ssg/lib/config';
+import { askMissing } from '@jungvonmatt/contentful-ssg/lib/ui';
 import { getMockData } from './lib/faker.js';
-export async function createFakes(config, contentTypeIds) {
-    const environment = await getEnvironment(config);
+export async function createFakes(contentTypeIds) {
+    const contentfulConfig = (await askMissing(await getConfig({
+        previewAccessToken: '-',
+        accessToken: '-',
+    })));
+    const environment = await getEnvironment(contentfulConfig);
     const { items: contentTypes } = await environment.getContentTypes();
     const { items } = await environment.getEditorInterfaces();
     const interfaces = Object.fromEntries(items

package/dist/lib/faker.js

@@ -280,9 +280,9 @@ const getRichtextFake = async (field) => {
 const getArrayFake = async (field) => {
     const { validations } = field.settings;
     const { size } = validations.find((validation) => Boolean(validation?.size)) || {};
-    let count = randomInt(0, 10);
+    let count = randomInt(0, 5);
     if (size) {
-        count = randomInt(size?.min ?? 0, size?.max ?? (size?.min ?? 0) + 10);
+        count = randomInt(size?.min ?? 0, size?.max ?? (size?.min ?? 0) + 5);
     }
     if (field.settings.items.type === FIELD_TYPE_SYMBOL) {
         return Promise.all(Array(count)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/contentful-fakes",
-  "version": "1.4.0",
+  "version": "1.4.8",
   "description": "Create fake data based on contentful data models",
   "main": "./dist/index.js",
   "type": "module",
@@ -35,8 +35,9 @@
   },
   "homepage": "https://github.com/jungvonmatt/contentful-ssg#readme",
   "dependencies": {
-    "@jungvonmatt/contentful-ssg": "^1.4.0",
+    "@jungvonmatt/contentful-ssg": "^1.4.8",
     "casual": "^1.6.2",
+    "chalk": "^5.0.0",
     "faker": "^5.5.3",
     "fs-extra": "^10.0.0",
     "randexp": "^0.5.3"
@@ -45,5 +46,5 @@
     "@types/chance": "^1.1.3",
     "@types/faker": "^6.6.9"
   },
-  "gitHead": "0d323f9884ae8fa48049e25bcd127954ee7988b8"
+  "gitHead": "28da6d98d1ba37a9bbaf6f1b22157c226be6d477"
 }

package/src/cli.ts

@@ -1,17 +1,16 @@
 #!/usr/bin/env node
 
 /* eslint-env node */
-import path from 'path';
-import { existsSync } from 'fs';
-import { outputFile } from 'fs-extra';
+import { stringify } from '@jungvonmatt/contentful-ssg/converter';
+import { forEachAsync } from '@jungvonmatt/contentful-ssg/lib/array';
+import { confirm, logError } from '@jungvonmatt/contentful-ssg/lib/ui';
+import chalk from 'chalk';
 import { Command } from 'commander';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
-import { ContentfulConfig } from '@jungvonmatt/contentful-ssg';
-import { getConfig } from '@jungvonmatt/contentful-ssg/lib/config';
-import { forEachAsync } from '@jungvonmatt/contentful-ssg/lib/array';
-import { stringify } from '@jungvonmatt/contentful-ssg/converter';
-import { logError, askMissing, confirm } from '@jungvonmatt/contentful-ssg/lib/ui';
+import { existsSync } from 'fs';
+import { outputFile } from 'fs-extra';
+import path from 'path';
 import { createFakes } from './index.js';
 
 const env = dotenv.config();
@@ -23,15 +22,10 @@ type CommandArgs = {
   contentType: string[];
   env: string;
   verbose: boolean;
-  force: boolean;
+  yes: boolean;
+  no: boolean;
 };
 
-const parseArgs = (cmd: CommandArgs) => ({
-  environment: cmd.env,
-  verbose: Boolean(cmd.verbose),
-  contentTypes: cmd.contentType,
-});
-
 type CommandError = Error & {
   errors?: Error[];
 };
@@ -60,35 +54,37 @@ program
   .option('-c, --content-type <content-type...>', 'Specify content-types')
   .option('-e, --extension <extension>', 'Specify output format', 'yaml')
   .option('-o, --output-directory <directory>', 'Specify output directory', 'data')
-  .option('-f, --force', 'Overwrite')
+  .option('--yes', 'Overwrite')
+  .option('--no', 'Skip')
   .action(
     actionRunner(async (cmd: CommandArgs) => {
       const contentTypes: string[] = cmd?.contentType ?? [];
-      const force: boolean = cmd?.force ?? false;
+      const yes: boolean = cmd?.yes ?? false;
+      const no: boolean = cmd?.no ?? false;
       const format: string = cmd?.extension ?? '';
       const outputDirectory: string = cmd?.outputDirectory ?? '';
-      const config = await getConfig(parseArgs(cmd));
-      const verified = await askMissing(config);
-      const fakes = await createFakes(verified as ContentfulConfig, contentTypes);
+      const fakes = await createFakes(contentTypes);
+      console.log();
+      if (!Object.keys(fakes).length) {
+        console.log('No files generated.');
+        console.log(
+          `No content models found for: ${chalk.cyan(contentTypes.join(chalk.white(', ')))}`
+        );
+      }
+
       await forEachAsync(Object.entries(fakes), async ([contentTypeId, fakeData]) => {
-        const [defaultData, minData] = fakeData;
+        const [defaultData] = fakeData;
         const dir = path.join(outputDirectory, contentTypeId);
         const filenameDefault = path.join(dir, `default.${format}`);
-        const filenameMin = path.join(dir, `min.${format}`);
-        if (
+        if (existsSync(filenameDefault) && no) {
+          console.log(chalk.yellow(`  skipped: ${filenameDefault}`));
+        } else if (
           !existsSync(filenameDefault) ||
-          force ||
+          yes ||
           (await confirm(`Overwrite file: ${filenameDefault}`))
         ) {
           await outputFile(filenameDefault, stringify(defaultData, format));
-        }
-
-        if (
-          !existsSync(filenameMin) ||
-          force ||
-          (await confirm(`Overwrite file: ${filenameMin}`))
-        ) {
-          await outputFile(filenameMin, stringify(minData, format));
+          console.log(chalk.green(`    added: ${filenameDefault}`));
         }
       });
     })

package/src/index.ts

@@ -1,12 +1,19 @@
 import { ContentfulConfig, KeyValueMap } from '@jungvonmatt/contentful-ssg';
 import { getEnvironment } from '@jungvonmatt/contentful-ssg/lib/contentful';
+import { getConfig } from '@jungvonmatt/contentful-ssg/lib/config';
+import { askMissing } from '@jungvonmatt/contentful-ssg/lib/ui';
 import { getMockData, ContentTypes } from './lib/faker.js';
 
 export async function createFakes(
-  config: ContentfulConfig,
   contentTypeIds: string[]
 ): Promise<Record<string, KeyValueMap[]>> {
-  const environment = await getEnvironment(config);
+  const contentfulConfig = (await askMissing(
+    await getConfig({
+      previewAccessToken: '-',
+      accessToken: '-',
+    })
+  )) as ContentfulConfig;
+  const environment = await getEnvironment(contentfulConfig);
   const { items: contentTypes } = await environment.getContentTypes();
   const { items } = await environment.getEditorInterfaces();
 

package/src/lib/faker.ts

@@ -391,9 +391,9 @@ const getRichtextFake = async (field: FieldInfo): Promise<KeyValueMap> => {
 const getArrayFake = async (field: FieldInfo): Promise<unknown[]> => {
   const { validations } = field.settings;
   const { size } = validations.find((validation) => Boolean(validation?.size)) || {};
-  let count = randomInt(0, 10);
+  let count = randomInt(0, 5);
   if (size) {
-    count = randomInt(size?.min ?? 0, size?.max ?? (size?.min ?? 0) + 10);
+    count = randomInt(size?.min ?? 0, size?.max ?? (size?.min ?? 0) + 5);
   }
 
   if (field.settings.items.type === FIELD_TYPE_SYMBOL) {