@contentstorage/core 0.3.25 → 0.3.26

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/lib/contentManagement.d.ts

@@ -1,4 +1,4 @@
-import { ContentStructure } from '../types.js';
+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.
@@ -16,20 +16,8 @@ export declare function setContentLanguage(contentJson: object): void;
  * @returns The text string from the JSON, or the fallbackValue, or undefined.
  */
 export declare function getText(pathString: keyof ContentStructure, fallbackValue?: string): string | undefined;
-export declare class CsText extends HTMLElement {
-    private _id;
-    private _keyForGetText;
-    static get observedAttributes(): string[];
-    constructor();
-    connectedCallback(): void;
-    disconnectedCallback(): void;
-    attributeChangedCallback(name: string, oldValue: string | null, newValue: string | null): void;
-    get idKey(): string | null;
-    set idKey(value: string | null);
-    /**
-     * Handles cases where properties might be set on the element before it's upgraded.
-     * Ensures initial attribute values are processed.
-     */
-    private upgradeProperties;
-    private updateText;
-}
+export declare function getImage(pathString: string, // Using string for dynamic paths
+fallbackValue?: ImageObject): ImageObject | undefined;
+export declare function getVariation<Path extends keyof ContentStructure>(pathString: Path, variationKey?: ContentStructure[Path] extends {
+    data: infer D;
+} ? keyof D : string, fallbackString?: string): string | undefined;

package/dist/lib/contentManagement.js

@@ -27,10 +27,7 @@ export function setContentLanguage(contentJson) {
  * 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(
-// The pathString is now a direct key of your (flattened) content structure.
-// TypeScript will provide autocompletion for these keys.
-pathString, fallbackValue) {
+export function getText(pathString, fallbackValue) {
     if (!activeContent) {
         const msg = `[Contentstorage] getText: Content not loaded (Key: "${String(pathString)}"). Ensure setContentLanguage() was called and completed successfully.`;
         console.warn(msg);
@@ -57,90 +54,93 @@ pathString, fallbackValue) {
         return fallbackValue;
     }
 }
-// Ensure getText and potentially ContentStructure are imported or available in the scope.
-// For this example, let's assume they are, along with activeContent.
-// import { getText, ContentStructure, activeContent } from './contentStorage'; // Adjust path as needed
-// Placeholder for ContentStructure if not already globally available for the cast
-// This would ideally be the same ContentStructure interface your getText function uses.
-export class CsText extends HTMLElement {
-    static get observedAttributes() {
-        // Define which attributes to observe for changes.
-        return ['data-contentstorage-id'];
-    }
-    constructor() {
-        super();
-        this._id = null;
-        // You can attach a Shadow DOM here if you need style encapsulation:
-        // this.attachShadow({ mode: 'open' });
-        // For simplicity, this example will manipulate the light DOM (this.textContent).
-    }
-    connectedCallback() {
-        // Called when the element is added to the document's DOM.
-        this.upgradeProperties();
-        this.updateText();
-    }
-    disconnectedCallback() {
-        // Called when the element is removed from the document's DOM.
-        // Perform any necessary cleanup here (e.g., remove event listeners if any were added).
+export function getImage(pathString, // Using string for dynamic paths
+fallbackValue) {
+    if (!activeContent) {
+        const msg = `[Contentstorage] getImage: Content not loaded (Key: "${pathString}"). Ensure setContentLanguage() was called and completed successfully.`;
+        console.warn(msg);
+        return fallbackValue;
     }
-    attributeChangedCallback(name, oldValue, newValue) {
-        // Called when one of the observed attributes changes.
-        let shouldUpdate = false;
-        if (name === 'data-contentstorage-id' && oldValue !== newValue) {
-            this._id = newValue;
-            // Important: The string from the attribute needs to be treated as keyof ContentStructure.
-            // This cast assumes the provided ID string is a valid key.
-            // Runtime validation against available keys in `activeContent` could be added for robustness.
-            this._keyForGetText = newValue;
-            shouldUpdate = true;
+    const keys = pathString.split('.');
+    let current = activeContent;
+    for (const key of keys) {
+        if (current && typeof current === 'object' && key in current) {
+            current = current[key];
         }
-        if (shouldUpdate) {
-            this.updateText();
+        else {
+            const msg = `[Contentstorage] getImage: Path "${pathString}" not found in loaded content.`;
+            console.warn(msg);
+            return fallbackValue;
         }
     }
-    // Property getters/setters (optional, but good practice if you want to interact via JS properties)
-    get idKey() {
-        return this._id;
+    if (current &&
+        typeof current === 'object' &&
+        current.contentstorage_type === 'image' &&
+        typeof current.url === 'string' &&
+        typeof current.altText === 'string') {
+        return current;
+    }
+    else {
+        const msg = `[Contentstorage] getImage: Value at path "${pathString}" is not a valid image object (actual value: ${JSON.stringify(current)}).`;
+        console.warn(msg);
+        return fallbackValue;
+    }
+}
+export function getVariation(pathString, variationKey, fallbackString) {
+    if (!activeContent) {
+        const msg = `[Contentstorage] getVariation: Content not loaded (Key: "${pathString}", Variation: "${variationKey?.toString()}"). Ensure setContentLanguage() was called and completed successfully.`;
+        console.warn(msg);
+        return fallbackString;
     }
-    set idKey(value) {
-        this._id = value;
-        this._keyForGetText = value; // Cast here as well
-        if (value === null) {
-            this.removeAttribute('data-contentstorage-id');
+    const keys = pathString.split('.');
+    let current = activeContent;
+    for (const key of keys) {
+        if (current && typeof current === 'object' && key in current) {
+            current = current[key];
         }
         else {
-            this.setAttribute('data-contentstorage-id', value);
-        }
-        // Note: setAttribute will trigger attributeChangedCallback if observed.
-    }
-    /**
-     * Handles cases where properties might be set on the element before it's upgraded.
-     * Ensures initial attribute values are processed.
-     */
-    upgradeProperties() {
-        // Check if properties were set before upgrade by checking attributes.
-        if (!this._id && this.hasAttribute('data-contentstorage-id')) {
-            this._id = this.getAttribute('data-contentstorage-id');
-            this._keyForGetText = this._id;
+            const msg = `[Contentstorage] getVariation: Path "${pathString}" for variation object not found in loaded content.`;
+            console.warn(msg);
+            return fallbackString;
         }
     }
-    updateText() {
-        if (!this.isConnected) {
-            // Don't try to update if the element isn't in the DOM.
-            return;
+    if (current &&
+        typeof current === 'object' &&
+        current.contentstorage_type === 'variation' &&
+        typeof current.data === 'object' &&
+        current.data !== null) {
+        const variationObject = current;
+        if (variationKey && typeof variationKey === 'string' && variationKey in variationObject.data) {
+            if (typeof variationObject.data[variationKey] === 'string') {
+                return variationObject.data[variationKey];
+            }
+            else {
+                const msg = `[Contentstorage] getVariation: Variation value for key "${variationKey}" at path "${pathString}" is not a string (actual type: ${typeof variationObject.data[variationKey]}).`;
+                console.warn(msg);
+            }
         }
-        if (this._keyForGetText) {
-            const textValue = getText(this._keyForGetText);
-            this.textContent = textValue !== undefined ? textValue : '';
-        }
-        else {
-            // No ID provided.
-            this.textContent = '';
+        // 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
+                    const msg = `[Contentstorage] getVariation: Variation key "${variationKey}" not found at path "${pathString}". Returning 'default' variation.`;
+                    console.warn(msg);
+                }
+                return variationObject.data.default;
+            }
+            else {
+                const msg = `[Contentstorage] getVariation: 'default' variation value at path "${pathString}" is not a string (actual type: ${typeof variationObject.data.default}).`;
+                console.warn(msg);
+            }
         }
+        // If neither specific key nor 'default' is found or valid
+        const msg = `[Contentstorage] getVariation: Neither variation key "${variationKey?.toString()}" nor 'default' variation found or valid at path "${pathString}".`;
+        console.warn(msg);
+        return fallbackString;
+    }
+    else {
+        const msg = `[Contentstorage] getVariation: Value at path "${pathString}" is not a valid variation object (actual value: ${JSON.stringify(current)}).`;
+        console.warn(msg);
+        return fallbackString;
     }
-}
-// Define the custom element for the browser to use.
-// Ensure this is called only once.
-if (typeof window !== 'undefined' && !customElements.get('cs-text')) {
-    customElements.define('cs-text', CsText);
 }

package/dist/types.d.ts

@@ -22,13 +22,15 @@ export type LanguageCode = 'SQ' | 'BE' | 'BS' | 'BG' | 'HR' | 'CS' | 'DA' | 'NL'
  */
 export interface ContentStructure {
 }
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            'cs-text': {
-                'data-contentstorage-id': string;
-            };
-        }
-    }
+export interface ImageObject {
+    contentstorage_type: "image";
+    url: string;
+    altText: string;
+}
+export interface VariationData {
+    [key: string]: string;
+}
+export interface VariationObject {
+    contentstorage_type: "variation";
+    data: VariationData;
 }
-export {};

package/package.json

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