@contentstorage/core 0.3.26 → 0.3.28

package/dist/helpers/flattenJson.js

@@ -1,36 +1,58 @@
 export function flattenJson(data, prefix = '', result = {}) {
-    if (typeof data === 'object' && data !== null) {
+    const stopFlatteningIfKeyExists = 'contentstorage_type';
+    // Check if the current data is an object that should not be flattened further
+    if (typeof data === 'object' &&
+        data !== null &&
+        !Array.isArray(data) && // Must be an object, not an array
+        Object.prototype.hasOwnProperty.call(data, stopFlatteningIfKeyExists)) {
+        if (prefix) {
+            // If there's a prefix, this object is nested. Assign it directly.
+            result[prefix] = data;
+        }
+        else {
+            // This is the root object itself having the 'stopFlatteningIfKeyExists' key.
+            // Consistent with how root primitives are handled (result remains empty),
+            // we don't add it to the result if there's no prefix. The function's
+            // purpose is to flatten *into* key-value pairs. If the root itself
+            // is one of these "don't flatten" types, 'result' will remain empty,
+            // which is consistent with the original function's behavior for root primitives.
+        }
+    }
+    else if (typeof data === 'object' && data !== null) {
+        // It's an object or array that should be processed further
         if (Array.isArray(data)) {
             if (data.length === 0 && prefix) {
                 // Handle empty arrays if prefix exists
                 result[prefix] = [];
             }
             data.forEach((item, index) => {
+                // Recursively call, the check for 'stopFlatteningIfKeyExists' will apply to 'item'
                 flattenJson(item, prefix ? `${prefix}.${index}` : `${index}`, result);
             });
         }
         else {
-            // It's an object
+            // 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)) {
                     isEmptyObject = false;
                     const newPrefix = prefix ? `${prefix}.${key}` : key;
+                    // Recursively call, the check for 'stopFlatteningIfKeyExists' will apply to 'data[key]'
                     flattenJson(data[key], newPrefix, result);
                 }
             }
             if (isEmptyObject && prefix) {
-                // Handle empty objects if prefix exists
+                // Handle empty objects (that were not 'special') if prefix exists
                 result[prefix] = {};
             }
         }
     }
     else if (prefix) {
-        // Primitive value (string, number, boolean, null)
+        // Primitive value (string, number, boolean, null) and has a prefix
         result[prefix] = data;
     }
-    // If the initial data itself is a primitive and prefix is empty, it means we can't flatten it into key-value pairs.
-    // This function is designed to take a root object or array.
-    // If the root `data` is a primitive, `result` would remain empty, which is fine; `pullContent` should validate the root.
+    // If the initial data is a primitive and prefix is empty, result remains empty.
+    // If the initial data is a 'special' object (contains 'stopFlatteningIfKeyExists')
+    // and prefix is empty, result also remains empty based on the logic above.
     return result;
 }

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/lib/contentManagement.d.ts

@@ -16,8 +16,7 @@ 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 function getImage(pathString: string, // Using string for dynamic paths
-fallbackValue?: ImageObject): ImageObject | undefined;
+export declare function getImage(pathString: keyof ContentStructure, 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

@@ -54,8 +54,7 @@ export function getText(pathString, fallbackValue) {
         return fallbackValue;
     }
 }
-export function getImage(pathString, // Using string for dynamic paths
-fallbackValue) {
+export function getImage(pathString, fallbackValue) {
     if (!activeContent) {
         const msg = `[Contentstorage] getImage: Content not loaded (Key: "${pathString}"). Ensure setContentLanguage() was called and completed successfully.`;
         console.warn(msg);

package/package.json

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