@contentstorage/core 0.3.4 → 0.3.6

package/dist/index.d.ts

@@ -1,4 +1,2 @@
-export { loadConfig } from './lib/configLoader';
-export type { AppConfig } from './lib/configLoader';
-export { generateTypes } from './scripts/generate-types';
-export { pullContent } from './scripts/pull-content';
+import { AppConfig } from './lib/configLoader.js';
+export { AppConfig };

package/dist/index.js

@@ -1,9 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pullContent = exports.generateTypes = exports.loadConfig = void 0;
-var configLoader_1 = require("./lib/configLoader");
-Object.defineProperty(exports, "loadConfig", { enumerable: true, get: function () { return configLoader_1.loadConfig; } });
-var generate_types_1 = require("./scripts/generate-types");
-Object.defineProperty(exports, "generateTypes", { enumerable: true, get: function () { return generate_types_1.generateTypes; } });
-var pull_content_1 = require("./scripts/pull-content");
-Object.defineProperty(exports, "pullContent", { enumerable: true, get: function () { return pull_content_1.pullContent; } });
+export {};

package/dist/lib/configLoader.d.ts

@@ -3,4 +3,4 @@ export interface AppConfig {
     contentDir: string;
     typesOutputFile: string;
 }
-export declare function loadConfig(): AppConfig;
+export declare function loadConfig(): Promise<AppConfig>;

package/dist/lib/configLoader.js

@@ -1,23 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfig = loadConfig;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
+import path from 'path';
+import fs from 'fs';
 const DEFAULT_CONFIG = {
-    contentDir: path_1.default.join('src', 'assets', 'content'),
-    typesOutputFile: path_1.default.join('src', 'generated', 'content-types.ts'),
+    contentDir: path.join('src', 'assets', 'content'),
+    typesOutputFile: path.join('src', 'generated', 'content-types.ts'),
 };
-function loadConfig() {
-    const configPath = path_1.default.resolve(process.cwd(), 'contentstorage.config.ts'); // Look in user's current working dir
+export async function loadConfig() {
+    const configPath = path.resolve(process.cwd(), 'contentstorage.config.ts'); // Look in user's current working dir
     let userConfig = {};
-    if (fs_1.default.existsSync(configPath)) {
+    if (fs.existsSync(configPath)) {
         try {
             // Use require for JS config file
-            const loadedModule = require(configPath);
+            const loadedModule = await import(configPath);
             userConfig = loadedModule.default || loadedModule;
+            console.log('Loaded config', JSON.stringify(userConfig));
             console.log(`Loaded configuration from ${configPath}`);
         }
         catch (error) {
@@ -43,8 +38,8 @@ function loadConfig() {
     // Resolve paths relative to the user's project root (process.cwd())
     const finalConfig = {
         contentUrl: mergedConfig.contentUrl,
-        contentDir: path_1.default.resolve(process.cwd(), mergedConfig.contentDir),
-        typesOutputFile: path_1.default.resolve(process.cwd(), mergedConfig.typesOutputFile),
+        contentDir: path.resolve(process.cwd(), mergedConfig.contentDir),
+        typesOutputFile: path.resolve(process.cwd(), mergedConfig.typesOutputFile),
     };
     return finalConfig;
 }

package/dist/scripts/generate-types.js

@@ -1,26 +1,20 @@
 #!/usr/bin/env node
-"use strict";
 // ^ Shebang ensures the script is executed with Node.js
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTypes = generateTypes;
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const json_to_ts_1 = __importDefault(require("json-to-ts")); // Import the library
-const chalk_1 = __importDefault(require("chalk")); // Optional: for colored output
-const configLoader_1 = require("../lib/configLoader");
-async function generateTypes() {
-    console.log(chalk_1.default.blue('Starting type generation...'));
-    const config = (0, configLoader_1.loadConfig)();
-    console.log(chalk_1.default.gray(`Reading JSON files from: ${config.contentDir}`));
-    console.log(chalk_1.default.gray(`Saving TypeScript types to: ${config.typesOutputFile}`));
+import fs from 'fs/promises';
+import path from 'path';
+import jsonToTS from 'json-to-ts'; // Import the library
+import chalk from 'chalk'; // Optional: for colored output
+import { loadConfig } from '../lib/configLoader.js';
+export async function generateTypes() {
+    console.log(chalk.blue('Starting type generation...'));
+    const config = await loadConfig();
+    console.log(chalk.gray(`Reading JSON files from: ${config.contentDir}`));
+    console.log(chalk.gray(`Saving TypeScript types to: ${config.typesOutputFile}`));
     try {
         // Read the content directory
         let files;
         try {
-            files = await promises_1.default.readdir(config.contentDir);
+            files = await fs.readdir(config.contentDir);
         }
         catch (err) {
             if (err.code === 'ENOENT') {
@@ -36,10 +30,10 @@ async function generateTypes() {
             throw new Error(`No JSON files found in ${config.contentDir}.`);
         }
         const firstJsonFile = jsonFiles[0];
-        const jsonFilePath = path_1.default.join(config.contentDir, firstJsonFile);
-        console.log(chalk_1.default.gray(`Using first JSON file for type generation: ${firstJsonFile}`));
+        const jsonFilePath = path.join(config.contentDir, firstJsonFile);
+        console.log(chalk.gray(`Using first JSON file for type generation: ${firstJsonFile}`));
         // Read the first JSON file
-        const jsonContent = await promises_1.default.readFile(jsonFilePath, 'utf-8');
+        const jsonContent = await fs.readFile(jsonFilePath, 'utf-8');
         // Parse the JSON content
         let jsonObject;
         try {
@@ -52,7 +46,7 @@ async function generateTypes() {
         // jsonToTS returns an array of strings, each being a line of the interface/type
         // We need to give the root type a name.
         const rootTypeName = 'RootContentItem'; // Or derive from filename, or make configurable
-        const typeDeclarations = (0, json_to_ts_1.default)(jsonObject, {
+        const typeDeclarations = jsonToTS.default(jsonObject, {
             rootName: rootTypeName,
         });
         if (!typeDeclarations || typeDeclarations.length === 0) {
@@ -60,15 +54,15 @@ async function generateTypes() {
         }
         const outputContent = typeDeclarations.join('\n\n'); // Add extra newline between interfaces
         // Ensure the output directory exists
-        const outputDir = path_1.default.dirname(config.typesOutputFile);
-        await promises_1.default.mkdir(outputDir, { recursive: true });
+        const outputDir = path.dirname(config.typesOutputFile);
+        await fs.mkdir(outputDir, { recursive: true });
         // Write the generated types to the output file
-        await promises_1.default.writeFile(config.typesOutputFile, outputContent, 'utf-8');
-        console.log(chalk_1.default.green(`TypeScript types generated successfully at ${config.typesOutputFile}`));
+        await fs.writeFile(config.typesOutputFile, outputContent, 'utf-8');
+        console.log(chalk.green(`TypeScript types generated successfully at ${config.typesOutputFile}`));
     }
     catch (error) {
-        console.error(chalk_1.default.red('Error generating TypeScript types:'));
-        console.error(chalk_1.default.red(error.message));
+        console.error(chalk.red('Error generating TypeScript types:'));
+        console.error(chalk.red(error.message));
         process.exit(1); // Exit with error code
     }
 }

package/dist/scripts/pull-content.js

@@ -1,29 +1,23 @@
 #!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pullContent = pullContent;
-const axios_1 = __importDefault(require("axios"));
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const chalk_1 = __importDefault(require("chalk"));
-const configLoader_1 = require("../lib/configLoader");
-async function pullContent() {
-    console.log(chalk_1.default.blue('Starting content pull...'));
-    const config = (0, configLoader_1.loadConfig)();
-    console.log(chalk_1.default.gray(`Getting content from: ${config.contentUrl}`));
-    console.log(chalk_1.default.gray(`Saving content to: ${config.contentDir}`));
+import axios from 'axios';
+import fs from 'fs/promises';
+import path from 'path';
+import chalk from 'chalk';
+import { loadConfig } from '../lib/configLoader.js';
+export async function pullContent() {
+    console.log(chalk.blue('Starting content pull...'));
+    const config = await loadConfig();
+    console.log(chalk.gray(`Getting content from: ${config.contentUrl}`));
+    console.log(chalk.gray(`Saving content to: ${config.contentDir}`));
     try {
         // Fetch data
-        const response = await axios_1.default.get(config.contentUrl);
+        const response = await axios.get(config.contentUrl);
         const jsonData = response.data; // Assume axios parses JSON automatically
         if (!jsonData) {
             throw new Error('No data received from the URL.');
         }
         // Ensure the output directory exists
-        await promises_1.default.mkdir(config.contentDir, { recursive: true });
+        await fs.mkdir(config.contentDir, { recursive: true });
         // --- How to save the data? ---
         // Option 1: Save the entire response as one file (e.g., content.json)
         // const outputPath = path.join(config.contentDir, 'content.json');
@@ -35,35 +29,35 @@ async function pullContent() {
             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_1.default.yellow('Received empty array. No files to save.'));
+            console.log(chalk.yellow('Received empty array. No files to save.'));
             return;
         }
-        console.log(chalk_1.default.gray(`Received ${jsonData.length} items. Saving individually...`));
+        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_1.default.join(config.contentDir, filename);
+            const outputPath = path.join(config.contentDir, filename);
             try {
-                await promises_1.default.writeFile(outputPath, JSON.stringify(item, null, 2));
+                await fs.writeFile(outputPath, JSON.stringify(item, null, 2));
                 filesSavedCount++;
             }
             catch (writeError) {
-                console.error(chalk_1.default.red(`Error saving file ${filename}:`), writeError.message);
+                console.error(chalk.red(`Error saving file ${filename}:`), writeError.message);
                 // Optionally decide whether to continue or stop on error
             }
         }
-        console.log(chalk_1.default.green(`Successfully saved ${filesSavedCount} files to ${config.contentDir}`));
+        console.log(chalk.green(`Successfully saved ${filesSavedCount} files to ${config.contentDir}`));
     }
     catch (error) {
-        console.error(chalk_1.default.red('Error fetching or saving content:'));
-        if (axios_1.default.isAxiosError(error)) {
-            console.error(chalk_1.default.red(`Status: ${error.response?.status}`));
-            console.error(chalk_1.default.red(`Data: ${JSON.stringify(error.response?.data)}`));
+        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_1.default.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.4",
+  "version": "0.3.6",
   "type": "module",
   "description": "Fetch content from contentstorage and generate TypeScript types",
   "module": "dist/index.js",