@contentstorage/core 0.3.28 → 0.3.30

package/dist/contentstorage-config.d.ts

@@ -0,0 +1,3 @@
+export declare const CONTENTSTORAGE_CONFIG: {
+    BASE_URL: string;
+};

package/dist/contentstorage-config.js

@@ -0,0 +1,3 @@
+export const CONTENTSTORAGE_CONFIG = {
+    BASE_URL: 'https://di0fmnnsdfsl2.cloudfront.net',
+};

package/dist/helpers/defineConfig.d.ts

@@ -0,0 +1,6 @@
+import { AppConfig } from '../types.js';
+/**
+ * Helper function to define your application configuration.
+ * Provides autocompletion and type-checking for contentstorage.config.js files.
+ */
+export declare function defineConfig(config: AppConfig): AppConfig;

package/dist/helpers/defineConfig.js

@@ -0,0 +1,19 @@
+/**
+ * Helper function to define your application configuration.
+ * Provides autocompletion and type-checking for contentstorage.config.js files.
+ */
+export function defineConfig(config) {
+    // You can add basic runtime validation here if desired,
+    // e.g., check if contentUrl is a valid URL format,
+    // or if languageCodes is not empty.
+    if (!config.languageCodes || config.languageCodes.length === 0) {
+        console.warn('Warning: languageCodes array is empty or missing in the configuration.');
+    }
+    if (!config.contentDir) {
+        // This would typically be a hard error, but defineConfig is more for type safety at edit time.
+        // Runtime validation (see point 3) is better for hard errors.
+        console.warn('Warning: contentDir is missing in the configuration.');
+    }
+    // ... other checks
+    return config;
+}

package/dist/helpers/flattenJson.js

@@ -31,7 +31,6 @@ export function flattenJson(data, prefix = '', result = {}) {
             });
         }
         else {
-            // It's an object (and not a special one that stops flattening, due to the preceding 'if' block)
             let isEmptyObject = true;
             for (const key in data) {
                 if (Object.prototype.hasOwnProperty.call(data, key)) {
@@ -48,7 +47,6 @@ export function flattenJson(data, prefix = '', result = {}) {
         }
     }
     else if (prefix) {
-        // Primitive value (string, number, boolean, null) and has a prefix
         result[prefix] = data;
     }
     // If the initial data is a primitive and prefix is empty, result remains empty.

package/dist/index.js

@@ -1,2 +1,2 @@
-import { setContentLanguage, getText, getImage, getVariation } from './lib/contentManagement.js';
+import { setContentLanguage, getText, getImage, getVariation, } from './lib/contentManagement.js';
 export { setContentLanguage, getText, getImage, getVariation };

package/dist/lib/configLoader.js

@@ -32,14 +32,13 @@ export async function loadConfig() {
         ...userConfig,
     };
     // Validate required fields
-    if (!mergedConfig.contentUrl) {
-        console.error('Error: Configuration is missing the required "contentUrl" property.');
-        process.exit(1); // Exit if required URL is missing
+    if (!mergedConfig.contentKey) {
+        console.error('Error: Configuration is missing the required "contentKey" property.');
+        process.exit(1);
     }
-    // Resolve paths relative to the user's project root (process.cwd())
     const finalConfig = {
         languageCodes: mergedConfig.languageCodes || [],
-        contentUrl: mergedConfig.contentUrl,
+        contentKey: mergedConfig.contentKey,
         contentDir: path.resolve(process.cwd(), mergedConfig.contentDir),
         typesOutputFile: path.resolve(process.cwd(), mergedConfig.typesOutputFile),
     };

package/dist/lib/contentManagement.d.ts

@@ -2,7 +2,7 @@ import { ContentStructure, ImageObject } from '../types.js';
 /**
  * Loads and sets the content for a specific language.
  * It will internally ensure the application configuration (for contentDir) is loaded.
- * @param languageCode The language code (e.g., 'EN', 'FR') for the JSON file to load.
+ * @param contentJson
  */
 export declare function setContentLanguage(contentJson: object): void;
 /**

package/dist/lib/contentManagement.js

@@ -2,11 +2,11 @@ let activeContent = null;
 /**
  * Loads and sets the content for a specific language.
  * It will internally ensure the application configuration (for contentDir) is loaded.
- * @param languageCode The language code (e.g., 'EN', 'FR') for the JSON file to load.
+ * @param contentJson
  */
 export function setContentLanguage(contentJson) {
     if (!contentJson || typeof contentJson !== 'object') {
-        throw new Error('[Contentstorage] Invalid contentUrl provided to setContentLanguage.');
+        throw new Error('[Contentstorage] Invalid contentKey might be provided which caused setContentLanguage to fail.');
     }
     try {
         activeContent = contentJson; // Relies on augmentation
@@ -109,7 +109,9 @@ export function getVariation(pathString, variationKey, fallbackString) {
         typeof current.data === 'object' &&
         current.data !== null) {
         const variationObject = current;
-        if (variationKey && typeof variationKey === 'string' && variationKey in variationObject.data) {
+        if (variationKey &&
+            typeof variationKey === 'string' &&
+            variationKey in variationObject.data) {
             if (typeof variationObject.data[variationKey] === 'string') {
                 return variationObject.data[variationKey];
             }
@@ -121,7 +123,8 @@ export function getVariation(pathString, variationKey, fallbackString) {
         // If specific variationKey is not found or not provided, try to return the 'default' variation
         if ('default' in variationObject.data && typeof variationKey === 'string') {
             if (typeof variationObject.data.default === 'string') {
-                if (variationKey && variationKey !== 'default') { // Warn if specific key was requested but default is being returned
+                if (variationKey && variationKey !== 'default') {
+                    // Warn if specific key was requested but default is being returned
                     const msg = `[Contentstorage] getVariation: Variation key "${variationKey}" not found at path "${pathString}". Returning 'default' variation.`;
                     console.warn(msg);
                 }

package/dist/scripts/generate-types.js

@@ -7,6 +7,7 @@ import jsonToTS from 'json-to-ts'; // Import the library
 import chalk from 'chalk'; // Optional: for colored output
 import { loadConfig } from '../lib/configLoader.js';
 import { flattenJson } from '../helpers/flattenJson.js';
+import { CONTENTSTORAGE_CONFIG } from '../contentstorage-config.js';
 export async function generateTypes() {
     console.log(chalk.blue('Starting type generation...'));
     const config = await loadConfig();
@@ -20,7 +21,7 @@ export async function generateTypes() {
         console.error(chalk.red.bold("Configuration error: 'languageCodes' must be a non-empty array."));
         process.exit(1);
     }
-    console.log(chalk.gray(`TypeScript types will be saved to: ${config.typesOutputFile}`));
+    console.log(chalk.blue(`TypeScript types will be saved to: ${config.typesOutputFile}`));
     let jsonObject; // To hold the JSON data from either local or remote source
     let dataSourceDescription = ''; // For clearer logging
     const firstLanguageCode = config.languageCodes[0];
@@ -30,7 +31,7 @@ export async function generateTypes() {
             try {
                 await fs.stat(config.contentDir); // Check if directory exists
                 attemptLocalLoad = true;
-                console.log(chalk.gray(`Local content directory found: ${config.contentDir}`));
+                console.log(chalk.blue(`Local content directory found: ${config.contentDir}`));
             }
             catch (statError) {
                 if (statError.code === 'ENOENT') {
@@ -51,12 +52,12 @@ export async function generateTypes() {
             const targetFilename = `${firstLanguageCode}.json`;
             const jsonFilePath = path.join(config.contentDir, targetFilename);
             dataSourceDescription = `local file (${jsonFilePath})`;
-            console.log(chalk.gray(`Attempting to read JSON from: ${jsonFilePath}`));
+            console.log(chalk.blue(`Attempting to read JSON from: ${jsonFilePath}`));
             try {
                 const jsonContentString = await fs.readFile(jsonFilePath, 'utf-8');
-                console.log(chalk.gray('Parsing JSON'));
+                console.log(chalk.blue('Parsing JSON'));
                 const parsendJsonObject = JSON.parse(jsonContentString);
-                console.log(chalk.gray('Flattening JSON for type generation'));
+                console.log(chalk.blue('Flattening JSON for type generation'));
                 jsonObject = flattenJson(parsendJsonObject);
                 console.log(chalk.green(`Successfully read and parsed JSON from ${jsonFilePath}.`));
             }
@@ -70,17 +71,16 @@ export async function generateTypes() {
             }
         }
         else {
-            // --- Fetch from URL ---
-            if (!config.contentUrl) {
-                throw new Error("Cannot generate types: 'contentDir' is not accessible or not specified, and 'contentUrl' is also missing in configuration.");
+            if (!config.contentKey) {
+                throw new Error('Cannot generate types: contentKey is missing');
             }
-            const fileUrl = `${config.contentUrl}/${firstLanguageCode}.json`; // Adjust URL construction if necessary
+            const fileUrl = `${CONTENTSTORAGE_CONFIG.BASE_URL}/${config.contentKey}/content/${firstLanguageCode}.json`; // Adjust URL construction if necessary
             dataSourceDescription = `remote URL (${fileUrl})`;
-            console.log(chalk.gray(`Attempting to fetch JSON from: ${fileUrl}`));
+            console.log(chalk.blue(`Attempting to fetch JSON from: ${fileUrl}`));
             try {
                 const response = await axios.get(fileUrl, { responseType: 'json' });
                 const jsonResponse = response.data;
-                console.log(chalk.gray('Flattening JSON for type generation'));
+                console.log(chalk.blue('Flattening JSON for type generation'));
                 jsonObject = flattenJson(jsonResponse);
                 if (typeof jsonObject !== 'object' || jsonObject === null) {
                     throw new Error(`Workspaceed data from ${fileUrl} is not a valid JSON object. Received type: ${typeof jsonObject}`);
@@ -105,7 +105,7 @@ export async function generateTypes() {
         }
         // Generate TypeScript interfaces using json-to-ts
         const rootTypeName = 'ContentRoot'; // As per your previous update
-        console.log(chalk.gray(`Generating TypeScript types with root name '${rootTypeName}'...`));
+        console.log(chalk.blue(`Generating TypeScript types with root name '${rootTypeName}'...`));
         const typeDeclarations = jsonToTS.default(jsonObject, {
             rootName: rootTypeName,
         });
@@ -123,10 +123,6 @@ export async function generateTypes() {
     catch (error) {
         console.error(chalk.red.bold('\nError generating TypeScript types:'));
         console.error(chalk.red(error.message));
-        // Optionally log stack for more details during development
-        // if (error.stack && process.env.NODE_ENV === 'development') {
-        //   console.error(chalk.gray(error.stack));
-        // }
         process.exit(1);
     }
 }

package/dist/scripts/pull-content.js

@@ -4,12 +4,13 @@ import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
 import { loadConfig } from '../lib/configLoader.js';
+import { CONTENTSTORAGE_CONFIG } from '../contentstorage-config.js';
 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();
-    console.log(chalk.gray(`Content base URL: ${config.contentUrl}`));
-    console.log(chalk.gray(`Saving content to: ${config.contentDir}`));
+    console.log(chalk.blue(`Content key: ${config.contentKey}`));
+    console.log(chalk.blue(`Saving content to: ${config.contentDir}`));
     try {
         // Validate languageCodes array
         if (!Array.isArray(config.languageCodes)) {
@@ -24,11 +25,11 @@ export async function pullContent() {
         await fs.mkdir(config.contentDir, { recursive: true });
         // Process each language code
         for (const languageCode of config.languageCodes) {
-            const fileUrl = `${config.contentUrl}/${languageCode}.json`;
+            const fileUrl = `${CONTENTSTORAGE_CONFIG.BASE_URL}/${config.contentKey}/content/${languageCode}.json`;
             const filename = `${languageCode}.json`;
             const outputPath = path.join(config.contentDir, filename);
             console.log(chalk.blue(`\nProcessing language: ${languageCode}`));
-            console.log(chalk.gray(`Workspaceing from: ${fileUrl}`));
+            console.log(chalk.blue(`Using following contentKey to fetch json: ${config.contentKey}`));
             try {
                 // Fetch data for the current language
                 const response = await axios.get(fileUrl);

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 export type AppConfig = {
     languageCodes: LanguageCode[];
-    contentUrl: string;
+    contentKey: string;
     contentDir: string;
     typesOutputFile: string;
 };
@@ -23,7 +23,7 @@ export type LanguageCode = 'SQ' | 'BE' | 'BS' | 'BG' | 'HR' | 'CS' | 'DA' | 'NL'
 export interface ContentStructure {
 }
 export interface ImageObject {
-    contentstorage_type: "image";
+    contentstorage_type: 'image';
     url: string;
     altText: string;
 }
@@ -31,6 +31,6 @@ export interface VariationData {
     [key: string]: string;
 }
 export interface VariationObject {
-    contentstorage_type: "variation";
+    contentstorage_type: 'variation';
     data: VariationData;
 }

package/package.json

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