@contentstorage/core 0.6.0 → 0.6.2

package/dist/lib/configLoader.js

@@ -32,14 +32,9 @@ export async function loadConfig() {
         ...DEFAULT_CONFIG,
         ...userConfig,
     };
-    // Validate required fields
-    if (!mergedConfig.contentKey) {
-        console.error(chalk.red('Error: Configuration is missing the required "contentKey" property.'));
-        process.exit(1);
-    }
     const finalConfig = {
         languageCodes: mergedConfig.languageCodes || [],
-        contentKey: mergedConfig.contentKey,
+        contentKey: mergedConfig.contentKey || '',
         contentDir: path.resolve(process.cwd(), mergedConfig.contentDir),
         typesOutputFile: path.resolve(process.cwd(), mergedConfig.typesOutputFile),
     };

package/dist/scripts/generate-types.js

@@ -12,25 +12,32 @@ export async function generateTypes() {
     console.log(chalk.blue('Starting type generation...'));
     const args = process.argv.slice(2);
     const cliConfig = {};
-    for (let i = 0; i < args.length; i++) {
-        if (args[i].startsWith('--')) {
-            const key = args[i].substring(2);
-            const value = args[i + 1];
-            if (value && !value.startsWith('--')) {
+    args.forEach((arg) => {
+        if (arg.startsWith('--')) {
+            const [key, value] = arg.substring(2).split('=');
+            if (key && value) {
+                const sanitizedValue = value
+                    .replace(/^"(.*)"$/, '$1')
+                    .replace(/^'(.*)'$/, '$1');
                 if (key === 'lang') {
-                    cliConfig.languageCodes = [value];
+                    cliConfig.languageCodes = [sanitizedValue];
                 }
                 else if (key === 'content-key') {
-                    cliConfig.contentKey = value;
+                    cliConfig.contentKey = sanitizedValue;
                 }
                 else if (key === 'output') {
-                    cliConfig.typesOutputFile = value;
+                    cliConfig.typesOutputFile = sanitizedValue;
                 }
-                i++; // Move to the next argument
             }
         }
+    });
+    let fileConfig = {};
+    try {
+        fileConfig = await loadConfig();
+    }
+    catch {
+        console.log(chalk.yellow('Could not load a configuration file. Proceeding with CLI arguments.'));
     }
-    const fileConfig = await loadConfig();
     const config = { ...fileConfig, ...cliConfig };
     if (!config.typesOutputFile) {
         console.error(chalk.red.bold("Configuration error: 'typesOutputFile' is missing."));

package/dist/scripts/pull-content.js

@@ -9,6 +9,11 @@ export async function pullContent() {
     console.log(chalk.blue('Starting content pull...'));
     // Load configuration (assuming this function is defined elsewhere and works)
     const config = await loadConfig();
+    // Validate required fields
+    if (!config.contentKey) {
+        console.error(chalk.red('Error: Configuration is missing the required "contentKey" property.'));
+        process.exit(1);
+    }
     console.log(chalk.blue(`Content key: ${config.contentKey}`));
     console.log(chalk.blue(`Saving content to: ${config.contentDir}`));
     try {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@contentstorage/core",
   "author": "Kaido Hussar <kaidohus@gmail.com>",
   "homepage": "https://contentstorage.app",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "type": "module",
   "description": "Fetch content from contentstorage and generate TypeScript types",
   "module": "dist/index.js",