@contentstorage/core 0.3.6 → 0.3.8

package/dist/lib/configLoader.js

@@ -5,7 +5,7 @@ const DEFAULT_CONFIG = {
     typesOutputFile: path.join('src', 'generated', 'content-types.ts'),
 };
 export async function loadConfig() {
-    const configPath = path.resolve(process.cwd(), 'contentstorage.config.ts'); // Look in user's current working dir
+    const configPath = path.resolve(process.cwd(), 'contentstorage.config.js'); // Look in user's current working dir
     let userConfig = {};
     if (fs.existsSync(configPath)) {
         try {

package/dist/scripts/pull-content.js

@@ -23,42 +23,40 @@ export async function pullContent() {
         // const outputPath = path.join(config.contentDir, 'content.json');
         // await fs.writeFile(outputPath, JSON.stringify(jsonData, null, 2));
         // console.log(chalk.green(`Content saved successfully to ${outputPath}`));
-        // Option 2: Assume the response is an ARRAY of objects, save each as a separate file
-        // This matches the requirement "use the first file from the directory" later
-        if (!Array.isArray(jsonData)) {
-            throw new Error(`Expected an array of objects from ${config.contentUrl}, but received type ${typeof jsonData}. Cannot save individual files.`);
-        }
-        if (jsonData.length === 0) {
-            console.log(chalk.yellow('Received empty array. No files to save.'));
+        // Check if jsonData is a single, non-null object (and not an array)
+        if (typeof jsonData !== 'object' || Array.isArray(jsonData)) {
+            console.log(chalk.red(`Expected a single JSON object from ${config.contentUrl}, but received type ${Array.isArray(jsonData) ? 'array' : typeof jsonData}. Cannot save the file.`));
             return;
         }
-        console.log(chalk.gray(`Received ${jsonData.length} items. Saving individually...`));
-        let filesSavedCount = 0;
-        for (let i = 0; i < jsonData.length; i++) {
-            const item = jsonData[i];
-            // Determine filename: use 'id' or 'slug' if available, otherwise use index
-            const filename = `${item.id || item.slug || i}.json`;
-            const outputPath = path.join(config.contentDir, filename);
-            try {
-                await fs.writeFile(outputPath, JSON.stringify(item, null, 2));
-                filesSavedCount++;
+        console.log(chalk.green(`Received JSON. Saving it to ${config.contentDir}`));
+        // Determine filename for the single object.
+        // Use 'id' or 'slug' from the object if available, otherwise use 'data' as a fallback base name.
+        const objectData = jsonData; // Use type assertion to access potential properties
+        const baseFilename = objectData.id || objectData.slug || 'data';
+        const filename = `${baseFilename}.json`;
+        const outputPath = path.join(config.contentDir, filename);
+        console.log(chalk.gray(`Received a single JSON object. Attempting to save as ${filename}...`));
+        try {
+            // Ensure the output directory exists
+            await fs.mkdir(config.contentDir, { recursive: true });
+            // Write the single JSON object to the file
+            await fs.writeFile(outputPath, JSON.stringify(jsonData, null, 2));
+            console.log(chalk.green(`Successfully saved the object to ${outputPath}`));
+        }
+        catch (error) {
+            console.error(chalk.red('Error fetching or saving content:'));
+            if (axios.isAxiosError(error)) {
+                console.error(chalk.red(`Status: ${error.response?.status}`));
+                console.error(chalk.red(`Data: ${JSON.stringify(error.response?.data)}`));
             }
-            catch (writeError) {
-                console.error(chalk.red(`Error saving file ${filename}:`), writeError.message);
-                // Optionally decide whether to continue or stop on error
+            else {
+                console.error(chalk.red(error.message));
             }
+            process.exit(1); // Exit with error code
         }
-        console.log(chalk.green(`Successfully saved ${filesSavedCount} files to ${config.contentDir}`));
     }
     catch (error) {
-        console.error(chalk.red('Error fetching or saving content:'));
-        if (axios.isAxiosError(error)) {
-            console.error(chalk.red(`Status: ${error.response?.status}`));
-            console.error(chalk.red(`Data: ${JSON.stringify(error.response?.data)}`));
-        }
-        else {
-            console.error(chalk.red(error.message));
-        }
+        console.error(chalk.red(error.message));
         process.exit(1); // Exit with error code
     }
 }

package/package.json

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