@contentstorage/core 0.3.13 → 0.3.15

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import { AppConfig, LanguageCode } from './types.js';
-import { setContentLanguage, getCurrentLanguage, getText } from './lib/contentManagement.js';
+import { setContentLanguage, getText } from './lib/contentManagement.js';
 export { AppConfig, LanguageCode };
-export { setContentLanguage, getText, getCurrentLanguage };
+export { setContentLanguage, getText };

package/dist/index.js

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

package/dist/lib/contentManagement.d.ts

@@ -1,10 +1,10 @@
-import { DotNotationPaths } from '../types.js';
+import { ContentStructure, DotNotationPaths } 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.
  */
-export declare function setContentLanguage(contentDir: string, languageCode: string): Promise<void>;
+export declare function setContentLanguage(contentJson: ContentStructure | null): void;
 /**
  * Retrieves the text string from the loaded JSON content for the given path.
  * Autocompletion for pathString is enabled via module augmentation of CustomContentStructure.
@@ -16,8 +16,3 @@ export declare function setContentLanguage(contentDir: string, languageCode: str
  * @returns The text string from the JSON, or the fallbackValue, or undefined.
  */
 export declare function getText(pathString: DotNotationPaths, fallbackValue?: string): string | undefined;
-/**
- * Gets the currently active language code.
- * @returns The active language code or null if no language is set.
- */
-export declare function getCurrentLanguage(): string | null;

package/dist/lib/contentManagement.js

@@ -1,36 +1,20 @@
-import fs from 'fs/promises';
-import path from 'path';
 let activeContent = null;
-let activeLanguage = 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.
  */
-export async function setContentLanguage(contentDir, languageCode) {
-    if (!contentDir ||
-        typeof contentDir !== 'string' ||
-        contentDir.trim() === '') {
+export function setContentLanguage(contentJson) {
+    if (!contentJson || typeof contentJson !== 'object') {
         throw new Error('[Contentstorage] Invalid contentUrl provided to setContentLanguage.');
     }
-    if (!languageCode ||
-        typeof languageCode !== 'string' ||
-        languageCode.trim() === '') {
-        throw new Error('[Contentstorage] Invalid language code provided to setContentLanguage.');
-    }
-    const targetFilename = `${languageCode}.json`;
-    const jsonFilePath = path.join(contentDir, targetFilename);
-    console.log(`[Contentstorage] Attempting to load content for language '${languageCode}' from ${jsonFilePath}...`);
     try {
-        const jsonContentString = await fs.readFile(jsonFilePath, 'utf-8');
-        activeContent = JSON.parse(jsonContentString); // Relies on augmentation
-        activeLanguage = languageCode;
-        console.log(`[Contentstorage] Content for language '${languageCode}' loaded successfully.`);
+        activeContent = contentJson; // Relies on augmentation
+        console.log(`[Contentstorage] Content loaded.`);
     }
     catch (error) {
         activeContent = null; // Reset on failure
-        console.error(`[Contentstorage] Failed to load content for language '${languageCode}' from ${jsonFilePath}. Error: ${error.message}`);
-        throw new Error(`[Contentstorage] Could not load content for language: ${languageCode}. Ensure file exists at '${jsonFilePath}' and is valid JSON.`);
+        console.error(`[Contentstorage] Failed to load content. Error: ${error.message}`);
     }
 }
 /**
@@ -43,9 +27,7 @@ export async function setContentLanguage(contentDir, languageCode) {
  * If not provided, and path is not found/value not string, undefined is returned.
  * @returns The text string from the JSON, or the fallbackValue, or undefined.
  */
-export function getText(
-// @ts-expect-error Is fine
-pathString, fallbackValue) {
+export function getText(pathString, fallbackValue) {
     if (!activeContent) {
         const msg = `[Contentstorage] getText: Content not loaded (Path: "${String(pathString)}"). Ensure setContentLanguage() was called and completed successfully.`;
         console.warn(msg);
@@ -58,7 +40,7 @@ pathString, fallbackValue) {
             current = current[key];
         }
         else {
-            const msg = `[Contentstorage] getText: Path "${String(pathString)}" not found in loaded content for language '${activeLanguage}'.`;
+            const msg = `[Contentstorage] getText: Path "${String(pathString)}" not found in loaded content.`;
             console.warn(msg);
             return fallbackValue;
         }
@@ -72,10 +54,3 @@ pathString, fallbackValue) {
         return fallbackValue;
     }
 }
-/**
- * Gets the currently active language code.
- * @returns The active language code or null if no language is set.
- */
-export function getCurrentLanguage() {
-    return activeLanguage;
-}

package/dist/types.d.ts

@@ -23,13 +23,17 @@ export type LanguageCode = 'SQ' | 'BE' | 'BS' | 'BG' | 'HR' | 'CS' | 'DA' | 'NL'
 export interface ContentStructure {
     [key: string]: any;
 }
+type MaxPathDepth = [any, any, any, any, any, any];
 /**
- * Generates a union of all possible dot-notation path strings for a given object type `T`.
- * Defaults to using the `ContentStructure` interface, which consumers augment.
+ * Generates a union of all possible dot-notation path strings for a given object type `T`,
+ * with a limit on recursion depth to prevent TypeScript errors.
+ * Defaults to using the `CustomContentStructure` interface, which consumers augment.
  *
- * @template T The object type to generate paths from. Defaults to `ContentStructure`.
- * @template Prefix Internal accumulator for the current path prefix during recursion.
+ * @template T The object type to generate paths from.
+ * @template Prefix Internal accumulator for the current path prefix.
+ * @template CurrentDepth Internal tuple to track recursion depth.
  */
-export type DotNotationPaths<T = ContentStructure, Prefix extends string = ''> = T extends object ? {
-    [K in keyof T]-?: K extends string | number ? T[K] extends object ? `${Prefix}${K}` | DotNotationPaths<T[K], `${Prefix}${K}.`> : `${Prefix}${K}` : never;
-}[keyof T] : '';
+export type DotNotationPaths<T = ContentStructure, Prefix extends string = '', CurrentDepth extends any[] = []> = T extends object ? {
+    [K in keyof T & (string | number)]-?: CurrentDepth['length'] extends MaxPathDepth['length'] ? `${Prefix}${K}` : T[K] extends object ? `${Prefix}${K}` | DotNotationPaths<T[K], `${Prefix}${K}.`, [...CurrentDepth, any]> : `${Prefix}${K}`;
+}[keyof T & (string | number)] : never;
+export {};

package/package.json

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