@jungvonmatt/contentful-ssg 1.0.4 → 1.0.5

package/dist/cli.js

@@ -2,6 +2,7 @@
 import path from 'path';
 import chalk from 'chalk';
 import { existsSync } from 'fs';
+import { readFile } from 'fs/promises';
 import { outputFile } from 'fs-extra';
 import prettier from 'prettier';
 import { Command } from 'commander';
@@ -44,7 +45,17 @@ program
     if (verified.directory?.startsWith('/')) {
         verified.directory = path.relative(process.cwd(), verified.directory);
     }
-    const environmentKeys = Object.keys(environmentConfig).filter((key) => environmentConfig[key] === verified[key]);
+    const environmentKeys = Object.keys(environmentConfig);
+    if (environmentConfig && existsSync('.env')) {
+        const envSource = await readFile('.env', 'utf8');
+        const nextEnvSource = envSource
+            .replace(/(CONTENTFUL_SPACE_ID\s*=\s*['"]?)[^'"]*(['"]?)/, `$1${verified.spaceId}$2`)
+            .replace(/(CONTENTFUL_ENVIRONMENT_ID\s*=\s*['"]?)[^'"]*(['"]?)/, `$1${verified.environmentId}$2`)
+            .replace(/(CONTENTFUL_MANAGEMENT_TOKEN\s*=\s*['"]?)[^'"]*(['"]?)/, `$1${verified.managementToken}$2`)
+            .replace(/(CONTENTFUL_PREVIEW_TOKEN\s*=\s*['"]?)[^'"]*(['"]?)/, `$1${verified.previewAccessToken}$2`)
+            .replace(/(CONTENTFUL_DELIVERY_TOKEN\s*=\s*['"]?)[^'"]*(['"]?)/, `$1${verified.accessToken}$2`);
+        await outputFile('.env', nextEnvSource);
+    }
     const cleanedConfig = omitKeys(verified, 'preview', 'verbose', 'rootDir', 'resolvedPlugins', 'host', 'managementToken', ...environmentKeys);
     let content = '';
     if (useTypescript) {

package/dist/lib/config.d.ts

@@ -1,3 +1,3 @@
 import type { Config, ContentfulConfig } from '../types.js';
-export declare const getEnvironmentConfig: () => ContentfulConfig;
+export declare const getEnvironmentConfig: (strict?: boolean) => ContentfulConfig;
 export declare const getConfig: (args?: Partial<Config>) => Promise<Config>;

package/dist/lib/config.js

@@ -72,13 +72,13 @@ const loadConfig = async (moduleName) => {
     });
     return explorer.search();
 };
-export const getEnvironmentConfig = () => removeEmpty({
+export const getEnvironmentConfig = (strict = true) => removeEmpty({
     spaceId: process.env.CONTENTFUL_SPACE_ID,
     environmentId: process.env.CONTENTFUL_ENVIRONMENT_ID,
     managementToken: process.env.CONTENTFUL_MANAGEMENT_TOKEN,
     previewAccessToken: process.env.CONTENTFUL_PREVIEW_TOKEN,
     accessToken: process.env.CONTENTFUL_DELIVERY_TOKEN,
-});
+}, strict);
 export const getConfig = async (args) => {
     const defaultOptions = {
         environmentId: 'master',
@@ -87,18 +87,18 @@ export const getConfig = async (args) => {
         plugins: [],
         resolvedPlugins: [],
     };
-    const environmentOptions = getEnvironmentConfig();
+    const environmentOptions = getEnvironmentConfig(false);
     let contentfulCliOptions = {};
     try {
         const contentfulConfig = await loadConfig('contentful');
-        if (!contentfulConfig.isEmpty) {
+        if (contentfulConfig && !contentfulConfig.isEmpty) {
             const { managementToken, activeSpaceId, activeEnvironmentId, host } = contentfulConfig.config;
             contentfulCliOptions = removeEmpty({
                 spaceId: activeSpaceId,
                 managementToken,
                 environmentId: activeEnvironmentId,
                 host,
-            });
+            }, false);
         }
     }
     catch (error) {
@@ -116,7 +116,7 @@ export const getConfig = async (args) => {
     args.rootDir = process.cwd();
     try {
         const configFile = await loadConfig('contentful-ssg');
-        if (!configFile.isEmpty) {
+        if (configFile && !configFile.isEmpty) {
             configFileOptions = configFile.config;
             args.rootDir = dirname(configFile.filepath);
             if (configFileOptions.directory && !isAbsolute(configFileOptions.directory)) {

package/dist/lib/object.d.ts

@@ -5,7 +5,8 @@ export declare const isObject: (something: any) => boolean;
 export declare const getEntries: <T>(obj: T) => Entries<T>;
 export declare const fromEntries: <T = [string, unknown][]>(entries: Entries<T>) => T;
 export declare const omitKeys: <T, K extends keyof T>(obj: T, ...keys: K[]) => T;
-export declare const removeEmpty: <T>(iterable: T) => T;
+export declare const filterKeys: <T, K extends keyof T>(obj: T, ...keys: K[]) => T;
+export declare const removeEmpty: <T>(iterable: T, strict?: boolean) => T;
 export declare const snakeCaseKeys: <T>(iterable: T) => T;
 export declare const groupBy: <T extends Record<string, unknown>>(array: T[], key: keyof T) => Record<string, T[]>;
 export {};

package/dist/lib/object.js

@@ -8,14 +8,19 @@ export const omitKeys = (obj, ...keys) => {
     const filtered = entries.filter(([key]) => !keys.includes(key));
     return fromEntries(filtered);
 };
-export const removeEmpty = (iterable) => {
+export const filterKeys = (obj, ...keys) => {
+    const entries = getEntries(obj);
+    const filtered = entries.filter(([key]) => keys.includes(key));
+    return fromEntries(filtered);
+};
+export const removeEmpty = (iterable, strict = true) => {
     if (Array.isArray(iterable)) {
         return iterable
-            .filter((v) => v !== null && v !== undefined)
+            .filter((v) => v !== null && v !== undefined && (strict || Boolean(v)))
             .map((v) => (v === Object(v) ? removeEmpty(v) : v));
     }
     return fromEntries(getEntries(iterable)
-        .filter(([, v]) => v !== null && v !== undefined)
+        .filter(([, v]) => v !== null && v !== undefined && (strict || Boolean(v)))
         .map(([k, v]) => [k, v === Object(v) ? removeEmpty(v) : v]));
 };
 export const snakeCaseKeys = (iterable) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/contentful-ssg",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",
@@ -9,6 +9,7 @@
     ".": "./dist/index.js",
     "./lib/object": "./dist/lib/object.js",
     "./lib/array": "./dist/lib/array.js",
+    "./lib/utils": "./dist/lib/utils.js",
     "./lib/contentful": "./dist/lib/contentful.js",
     "./lib/hook-manager": "./dist/lib/hook-manager.js",
     "./lib/file-manager": "./dist/lib/file-manager.js",
@@ -23,6 +24,9 @@
       ".": [
         "./dist/types.d.ts"
       ],
+      "lib/utils": [
+        "./dist/lib/utils.d.ts"
+      ],
       "lib/object": [
         "./dist/lib/object.d.ts"
       ],
@@ -139,5 +143,5 @@
       "module": "es2020"
     }
   },
-  "gitHead": "9da40bcd4fa8124cf7ae3ff6a2dcfca91c82c4fb"
+  "gitHead": "03741b4add20ce95e1cd539bc46b7630cddcc2c3"
 }

package/src/cli.ts

@@ -4,6 +4,7 @@
 import path from 'path';
 import chalk from 'chalk';
 import { existsSync } from 'fs';
+import { readFile } from 'fs/promises';
 import { outputFile } from 'fs-extra';
 import prettier from 'prettier';
 import { Command } from 'commander';
@@ -67,9 +68,34 @@ program
         verified.directory = path.relative(process.cwd(), verified.directory);
       }
 
-      const environmentKeys: Array<keyof ContentfulConfig> = (
-        Object.keys(environmentConfig) as Array<keyof ContentfulConfig>
-      ).filter((key) => environmentConfig[key] === verified[key]);
+      const environmentKeys: Array<keyof ContentfulConfig> = Object.keys(
+        environmentConfig
+      ) as Array<keyof ContentfulConfig>;
+
+      // Update .env file
+      if (environmentConfig && existsSync('.env')) {
+        const envSource = await readFile('.env', 'utf8');
+        const nextEnvSource = envSource
+          .replace(/(CONTENTFUL_SPACE_ID\s*=\s*['"]?)[^'"]*(['"]?)/, `$1${verified.spaceId}$2`)
+          .replace(
+            /(CONTENTFUL_ENVIRONMENT_ID\s*=\s*['"]?)[^'"]*(['"]?)/,
+            `$1${verified.environmentId}$2`
+          )
+          .replace(
+            /(CONTENTFUL_MANAGEMENT_TOKEN\s*=\s*['"]?)[^'"]*(['"]?)/,
+            `$1${verified.managementToken}$2`
+          )
+          .replace(
+            /(CONTENTFUL_PREVIEW_TOKEN\s*=\s*['"]?)[^'"]*(['"]?)/,
+            `$1${verified.previewAccessToken}$2`
+          )
+          .replace(
+            /(CONTENTFUL_DELIVERY_TOKEN\s*=\s*['"]?)[^'"]*(['"]?)/,
+            `$1${verified.accessToken}$2`
+          );
+
+        await outputFile('.env', nextEnvSource);
+      }
 
       const cleanedConfig = omitKeys(
         verified,

package/src/lib/config.ts

@@ -105,14 +105,17 @@ const loadConfig = async (moduleName: string): Promise<CosmiconfigResult> => {
   return explorer.search();
 };
 
-export const getEnvironmentConfig = (): ContentfulConfig =>
-  removeEmpty({
-    spaceId: process.env.CONTENTFUL_SPACE_ID!,
-    environmentId: process.env.CONTENTFUL_ENVIRONMENT_ID!,
-    managementToken: process.env.CONTENTFUL_MANAGEMENT_TOKEN!,
-    previewAccessToken: process.env.CONTENTFUL_PREVIEW_TOKEN!,
-    accessToken: process.env.CONTENTFUL_DELIVERY_TOKEN!,
-  });
+export const getEnvironmentConfig = (strict = true): ContentfulConfig =>
+  removeEmpty(
+    {
+      spaceId: process.env.CONTENTFUL_SPACE_ID!,
+      environmentId: process.env.CONTENTFUL_ENVIRONMENT_ID!,
+      managementToken: process.env.CONTENTFUL_MANAGEMENT_TOKEN!,
+      previewAccessToken: process.env.CONTENTFUL_PREVIEW_TOKEN!,
+      accessToken: process.env.CONTENTFUL_DELIVERY_TOKEN!,
+    },
+    strict
+  );
 
 /**
  * Get configuration
@@ -127,22 +130,25 @@ export const getConfig = async (args?: Partial<Config>): Promise<Config> => {
     resolvedPlugins: [],
   };
 
-  const environmentOptions = getEnvironmentConfig();
+  const environmentOptions = getEnvironmentConfig(false);
   let contentfulCliOptions: Partial<ContentfulConfig> = {};
 
   try {
     // Get configuration from contentful rc file (created by the contentful cli command)
     const contentfulConfig = await loadConfig('contentful');
-    if (!contentfulConfig.isEmpty) {
+    if (contentfulConfig && !contentfulConfig.isEmpty) {
       const { managementToken, activeSpaceId, activeEnvironmentId, host } =
         contentfulConfig.config as ContentfulRcConfig;
 
-      contentfulCliOptions = removeEmpty({
-        spaceId: activeSpaceId,
-        managementToken,
-        environmentId: activeEnvironmentId,
-        host,
-      });
+      contentfulCliOptions = removeEmpty(
+        {
+          spaceId: activeSpaceId,
+          managementToken,
+          environmentId: activeEnvironmentId,
+          host,
+        },
+        false
+      );
     }
   } catch (error: unknown) {
     if (typeof error === 'string') {
@@ -159,7 +165,7 @@ export const getConfig = async (args?: Partial<Config>): Promise<Config> => {
   try {
     // Get configuration from contentful-ssg rc file
     const configFile = await loadConfig('contentful-ssg');
-    if (!configFile.isEmpty) {
+    if (configFile && !configFile.isEmpty) {
       configFileOptions = configFile.config as Partial<Config>;
       args.rootDir = dirname(configFile.filepath);
       if (configFileOptions.directory && !isAbsolute(configFileOptions.directory)) {

package/src/lib/object.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { isObject, omitKeys, removeEmpty, snakeCaseKeys, groupBy } from './object';
+import { isObject, omitKeys, filterKeys, removeEmpty, snakeCaseKeys, groupBy } from './object';
 
 test('isObject', async () => {
   const arr = [];
@@ -17,6 +17,11 @@ test('omitKeys', () => {
   expect(value).toEqual({ b: 2 });
 });
 
+test('filterKeys', () => {
+  const value = filterKeys({ a: 1, b: 2, c: 3 }, 'a', 'c');
+  expect(value).toEqual({ a: 1, c: 3 });
+});
+
 test('removeEmpty', () => {
   const value = removeEmpty({
     a: { c: undefined },
@@ -26,6 +31,16 @@ test('removeEmpty', () => {
   expect(value).toEqual({ a: {}, c: [1, { x: 1, z: [7] }, 3, 5] });
 });
 
+
+test('removeEmpty non-strict', () => {
+  const value = removeEmpty({
+    a: "",
+    b: 0,
+    c: 1,
+  }, false);
+  expect(value).toEqual({ c: 1 });
+});
+
 test('groupBy', () => {
   const value = groupBy(
     [

package/src/lib/object.ts

@@ -30,16 +30,27 @@ export const omitKeys = <T, K extends keyof T>(obj: T, ...keys: K[]): T => {
   return fromEntries(filtered);
 };
 
+/**
+ * Filter values by key from object
+ * @param {*} obj
+ * @param {*} keys
+ */
+export const filterKeys = <T, K extends keyof T>(obj: T, ...keys: K[]): T => {
+  const entries: Entries<T> = getEntries(obj);
+  const filtered = entries.filter(([key]) => keys.includes(key as K));
+  return fromEntries(filtered);
+};
+
 /**
  * Recursive remove empty items (null,undefined) from object
  * @param iterable Source object
  * @returns Cleaned object
  */
-export const removeEmpty = <T>(iterable: T): T => {
+export const removeEmpty = <T>(iterable: T, strict = true): T => {
   if (Array.isArray(iterable)) {
     return (
       iterable
-        .filter((v) => v !== null && v !== undefined)
+        .filter((v) => v !== null && v !== undefined && (strict || Boolean(v)))
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         .map((v) => (v === Object(v) ? removeEmpty(v) : v)) as unknown as T
     );
@@ -47,7 +58,7 @@ export const removeEmpty = <T>(iterable: T): T => {
 
   return fromEntries(
     getEntries(iterable)
-      .filter(([, v]) => v !== null && v !== undefined)
+      .filter(([, v]) => v !== null && v !== undefined && (strict || Boolean(v)))
       .map(([k, v]) => [k, v === Object(v) ? removeEmpty(v) : v])
   );
 };