@admin-layout/tailwind-design-pro 12.0.16-alpha.55 → 12.0.16-alpha.56

package/lib/utils/configOverrides.js

@@ -72,70 +72,6 @@
  * parseMultipleBracketIdentifiers("[/dashboard.mobile]") // Backward compatibility
  * // Returns: ['/dashboard', 'mobile']
  */
-function parseMultipleBracketIdentifiers(overrideKey) {
-  const identifiers = [];
-  // Match all bracket pairs: [something]
-  const bracketMatches = overrideKey.match(/\[([^\]]+)\]/g);
-  if (!bracketMatches) {
-    return identifiers;
-  }
-  // If there's only one bracket, check if it contains a dot (old format)
-  if (bracketMatches.length === 1) {
-    const content = bracketMatches[0].slice(1, -1); // Remove brackets
-    // Check if it's the old format with dot notation
-    if (content.includes('.')) {
-      const parts = content.split('.');
-      // Handle [.device] pattern
-      if (parts[0] === '' && parts[1]) {
-        identifiers.push(parts[1]);
-      }
-      // Handle [route.device] pattern
-      else {
-        parts.forEach(part => {
-          if (part) identifiers.push(part);
-        });
-      }
-    } else {
-      // Single identifier without dot
-      identifiers.push(content);
-    }
-  } else {
-    // Multiple brackets: extract content from each
-    bracketMatches.forEach(match => {
-      const content = match.slice(1, -1); // Remove brackets
-      if (content) {
-        identifiers.push(content);
-      }
-    });
-  }
-  return identifiers;
-}
-/**
- * Convert a dot-notation path to a nested object
- * @example
- * setNestedValue({}, 'uilayout.regions.header.showLogo', false)
- * // Returns: { uilayout: { regions: { header: { showLogo: false } } } }
- */
-function setNestedValue(obj, path, value) {
-  const keys = path.split('.');
-  const result = {
-    ...obj
-  };
-  let current = result;
-  for (let i = 0; i < keys.length - 1; i++) {
-    const key = keys[i];
-    if (!current[key] || typeof current[key] !== 'object') {
-      current[key] = {};
-    } else {
-      current[key] = {
-        ...current[key]
-      };
-    }
-    current = current[key];
-  }
-  current[keys[keys.length - 1]] = value;
-  return result;
-}
 /**
  * Get a value from a nested object using dot notation
  * @example
@@ -152,204 +88,4 @@ function getNestedValue(obj, path, defaultValue) {
     current = current[key];
   }
   return current !== undefined ? current : defaultValue;
-}
-/**
- * Build an override context key from context
- *
- * Format: [route][device] or [route] or [device]
- *
- * @example
- * buildOverrideKey({ route: '/dashboard', device: 'mobile' })
- * // Returns: "[/dashboard][mobile]"
- *
- * buildOverrideKey({ route: '/dashboard' })
- * // Returns: "[/dashboard]"
- *
- * buildOverrideKey({ device: 'mobile' })
- * // Returns: "[mobile]"
- */
-function buildOverrideKey(context) {
-  const {
-    route,
-    device,
-    ...rest
-  } = context;
-  // Handle route and device specifically - use multiple bracket format
-  if (route && device) {
-    return `[${route}][${device}]`;
-  } else if (route) {
-    return `[${route}]`;
-  } else if (device) {
-    return `[${device}]`;
-  }
-  // Fallback for other context keys (future extensibility)
-  const parts = [];
-  for (const [key, value] of Object.entries(rest)) {
-    if (value !== undefined && value !== null) {
-      parts.push(`${key}=${value}`);
-    }
-  }
-  if (parts.length > 0) {
-    return `[${parts.join(',')}]`;
-  }
-  return '';
-}
-/**
- * Parse an override key into its components
- * Supports both new multiple bracket format and legacy dot notation
- *
- * @example
- * parseOverrideKey("[/dashboard][mobile]")  // New format
- * // Returns: { route: '/dashboard', device: 'mobile' }
- *
- * parseOverrideKey("[/dashboard.mobile]")   // Legacy format
- * // Returns: { route: '/dashboard', device: 'mobile' }
- *
- * parseOverrideKey("[/dashboard]")
- * // Returns: { route: '/dashboard' }
- *
- * parseOverrideKey("[mobile]")
- * // Returns: { device: 'mobile' }
- *
- * parseOverrideKey("[.mobile]")  // Legacy device-only format
- * // Returns: { device: 'mobile' }
- */
-function parseOverrideKey(overrideKey) {
-  const context = {};
-  // First try multiple bracket pattern: [/route][device]
-  const multipleBracketMatch = overrideKey.match(/^(\[[^\]]+\])+$/);
-  if (multipleBracketMatch) {
-    const identifiers = parseMultipleBracketIdentifiers(overrideKey);
-    identifiers.forEach(identifier => {
-      if (identifier.startsWith('/')) {
-        context.route = identifier;
-      } else if (identifier === 'mobile' || identifier === 'desktop') {
-        context.device = identifier;
-      }
-    });
-    return context;
-  }
-  // Fallback to legacy single bracket pattern: [route.device] or [route] or [.device]
-  const match = overrideKey.match(/^\[([^\]]+)\]$/);
-  if (!match) {
-    return context;
-  }
-  const content = match[1];
-  // Check if it contains a dot
-  if (content.includes('.')) {
-    const parts = content.split('.');
-    // Handle [.device] pattern
-    if (parts[0] === '') {
-      context.device = parts[1];
-    }
-    // Handle [route.device] pattern
-    else {
-      context.route = parts[0];
-      if (parts[1]) {
-        context.device = parts[1];
-      }
-    }
-  } else {
-    // Handle [route] pattern (no dot means route only)
-    context.route = content;
-  }
-  return context;
-}
-/**
- * Get a configuration value with override support
- *
- * Priority:
- * 1. Most specific override (all context matches)
- * 2. Partial overrides (some context matches)
- * 3. Base configuration value
- * 4. Default value
- *
- * Works with nested storage where overrides are stored as:
- * { "[route=/dashboard][device=mobile]": { uilayout: { regions: { header: { showLogo: false } } } } }
- */
-function getConfigValue(settings, configKey, context, defaultValue) {
-  // Build the context key
-  const contextKey = buildOverrideKey(context);
-  // Check for exact override in nested structure
-  if (contextKey && settings?.[contextKey]) {
-    const overrideValue = getNestedValue(settings[contextKey], `uilayout.${configKey}`);
-    if (overrideValue !== undefined) {
-      return overrideValue;
-    }
-  }
-  // Check for partial overrides with priority:
-  // 1. [route.device] (most specific)
-  // 2. [route] (route only)
-  // 3. [.device] (device only)
-  if (settings) {
-    const partialMatches = [];
-    for (const key of Object.keys(settings)) {
-      // Only check keys that look like context keys (start with '[')
-      if (!key.startsWith('[')) continue;
-      const parsed = parseOverrideKey(key);
-      // Check if this override matches current context
-      let matches = true;
-      let specificity = 0;
-      if (parsed.route !== undefined) {
-        if (parsed.route === context.route) {
-          specificity += 2; // Route match is worth 2 points
-        } else {
-          matches = false;
-        }
-      }
-      if (parsed.device !== undefined) {
-        if (parsed.device === context.device) {
-          specificity += 1; // Device match is worth 1 point
-        } else {
-          matches = false;
-        }
-      }
-      if (matches && specificity > 0) {
-        partialMatches.push({
-          key,
-          specificity
-        });
-      }
-    }
-    // Use the most specific override
-    if (partialMatches.length > 0) {
-      const mostSpecific = partialMatches.reduce((a, b) => a.specificity > b.specificity ? a : b);
-      const overrideValue = getNestedValue(settings[mostSpecific.key], `uilayout.${configKey}`);
-      if (overrideValue !== undefined) {
-        return overrideValue;
-      }
-    }
-  }
-  // Check base configuration
-  const baseValue = getNestedValue(settings, `uilayout.${configKey}`);
-  if (baseValue !== undefined) {
-    return baseValue;
-  }
-  return defaultValue;
-}
-/**
- * Set a configuration value as an override
- *
- * Returns the context key and nested value structure.
- * The service layer will merge this into the settings object.
- *
- * @example
- * const result = setConfigOverride('regions.header.showLogo', false, { route: '/dashboard', device: 'mobile' });
- * // Returns: {
- * //   contextKey: '[device=mobile][route=/dashboard]',
- * //   path: 'uilayout.regions.header.showLogo',
- * //   value: false,
- * //   nestedValue: { uilayout: { regions: { header: { showLogo: false } } } }
- * // }
- */
-function setConfigOverride(configKey, value, context) {
-  const contextKey = buildOverrideKey(context);
-  const path = `uilayout.${configKey}`;
-  const nestedValue = setNestedValue({}, path, value);
-  return {
-    contextKey,
-    path,
-    value,
-    nestedValue
-  };
-}export{buildOverrideKey,getConfigValue,getNestedValue,parseMultipleBracketIdentifiers,parseOverrideKey,setConfigOverride,setNestedValue};//# sourceMappingURL=configOverrides.js.map
+}export{getNestedValue};//# sourceMappingURL=configOverrides.js.map

package/lib/utils/configOverrides.js.map

@@ -1 +1 @@
-{"version":3,"file":"configOverrides.js","sources":["../../src/utils/configOverrides.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"configOverrides.js","sources":["../../src/utils/configOverrides.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2DG;AAUH;;;;;;;;;;;;;AAaG;;AA6JA;AACH;;;AAII;AACI,SAAI,cAAgB,CAAA,GAAI,EAAA,IAAO,EAAA,YAAc,EAAA;AACzC,EAAA,MAAA,IAAA,GAAA,IAAO;aACV,GAAA,GAAA;AACD,EAAA,KAAA,MAAA,GAAO,IAAG,IAAA,EAAQ;IACtB,IAAC,OAAA,KAAA,IAAA,IAAA,OAAA,KAAA,SAAA,IAAA,OAAA,OAAA,KAAA,QAAA,EAAA;MAED,OAAO,YAAY;AACvB,IAAC;AAED,IAAA,OAAA,GAAA,OAAA,CAAA,GAAA,CAAA;;AAEG,EAAA,OAAA,OAAA,KAAA,SAAA,GAAA,OAAA,GAAA,YAAA;AACH"}

package/lib/utils/settingsUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settingsUtils.d.ts","sourceRoot":"","sources":["../../src/utils/settingsUtils.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,GACxB,iBAAiB,GAAG,EACpB,aAAa,MAAM,EACnB,kBAAkB,OAAO,EACzB,cAAc,MAAM,EACpB,YAAY,SAAS,GAAG,QAAQ,EAChC,eAAe,GAAG,QA8BrB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,GACnC,UAAU,GAAG,EACb,cAAc,MAAM,EACpB,YAAY,SAAS,GAAG,QAAQ,KACjC,OA2BF,CAAC"}
+{"version":3,"file":"settingsUtils.d.ts","sourceRoot":"","sources":["../../src/utils/settingsUtils.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,GACxB,iBAAiB,GAAG,EACpB,aAAa,MAAM,EACnB,kBAAkB,OAAO,EACzB,cAAc,MAAM,EACpB,YAAY,SAAS,GAAG,QAAQ,EAChC,eAAe,GAAG,QAwCrB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,GACnC,UAAU,GAAG,EACb,cAAc,MAAM,EACpB,YAAY,SAAS,GAAG,QAAQ,KACjC,OA2BF,CAAC"}

package/lib/utils/settingsUtils.js

@@ -14,22 +14,31 @@ const getSettingValue = (machineSettings, settingName, applyToAllRoutes, current
   }
   // Try to get from changedSettings first (most recent updates)
   const changedSettings = machineSettings?.changedSettings || {};
+  const configModel = machineSettings?.configModel;
   if (applyToAllRoutes) {
-    // Global mode: look for [device].uilayout.settingName in changedSettings
-    const globalKey = `[${deviceType}].uilayout.${settingName}`;
+    // Global mode: look for [device].settingName in changedSettings
+    const globalKey = `[${deviceType}].${settingName}`;
     if (changedSettings[globalKey] !== undefined) {
       return changedSettings[globalKey];
     }
-    // Fall back to context value
-    const value = getNestedValue(machineSettings, settingName);
-    return value !== undefined ? value : defaultValue;
+    // Apply device-only override to get global settings
+    if (configModel) {
+      const deviceKey = `[${deviceType}]`;
+      const globalOverride = configModel.override(deviceKey);
+      const value = getNestedValue(globalOverride?.contents || configModel.contents, settingName);
+      if (value !== undefined) {
+        console.log(`  → Returning from configModel override:`, value);
+        return value;
+      }
+    }
+    return defaultValue;
   } else {
-    // Route-specific mode: look for [route][device].uilayout.settingName in changedSettings
-    const routeKey = `[${currentRoute}][${deviceType}].uilayout.${settingName}`;
+    // Route-specific mode: look for [route][device].settingName in changedSettings
+    const routeKey = `[${currentRoute}][${deviceType}].${settingName}`;
     if (changedSettings[routeKey] !== undefined) {
       return changedSettings[routeKey];
     }
-    // Fall back to context value (which has route-specific overrides if on that route)
+    // Fall back to context value (which has route-specific overrides already applied)
     const value = getNestedValue(machineSettings, settingName);
     return value !== undefined ? value : defaultValue;
   }

package/lib/utils/settingsUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingsUtils.js","sources":["../../src/utils/settingsUtils.ts"],"sourcesContent":[null],"names":[],"mappings":"kDAEA;;;;;;;;;AASG;AACI,MAAM,eAAe,GAAG,CAC3B,eAAoB,EACpB,WAAmB,EACnB,gBAAyB,EACzB,YAAoB,EACpB,UAAgC,EAChC,YAAkB,KAClB;MACA,CAAA,eAAK,EAAe;AAChB,IAAA,OAAA;;;AAIJ,EAAA,MAAA,kBAAqB,eAAG,EAAe,eAAE,IAAe,EAAI;MAE5D,gBAAI,EAAgB;;AAEhB,IAAA,MAAA,aAAe,CAAA,EAAG,sBAAc,EAAA,WAAc,CAAA,CAAA;AAC9C,IAAA,IAAA,yBAAoB,CAAA,KAAU,SAAK,EAAA;AAC/B,MAAA,OAAA,eAAO,CAAA,SAAgB,CAAA;;;UAI3B,KAAM,GAAA,cAAQ,CAAA,4BAAgC,CAAA;WAC9C,KAAO,KAAK,SAAK,GAAA,KAAY,GAAA,YAAQ;SACxC;;UACG,QAAA,GAAA,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,WAAA,EAAA,WAAA,CAAA,CAAA;QACA,wBAAqB,CAAA,KAAA,SAAiB,EAAA;AACtC,MAAA,sBAAoB,CAAA,QAAS,CAAA;AACzB,IAAA;;UAGJ,KAAA,GAAA,cAAA,CAAA,eAAA,EAAA,WAAA,CAAA;WACA,KAAM,cAAQ,GAAA,oBAA8B;;;AAGpD;AAEA;;;;;;AAMG,MAAA,0BAAA,GAAA,CAAA,QAAA,EAAA,YAAA,EAAA,UAAA,KAAA;AACH,EAAA,MAAO,WAAM,GAAA,QAAA,EAAA,WACT;AAIA,EAAA,IAAA,CAAA,WAAM,EAAA;IACN,OAAK,KAAA,CAAA;;QAEJ,cAAA,GAAA,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,CAAA,CAAA;AAED,EAAA,MAAA,gBAAoB;AACpB;QAEA,gBAAA,GAAA,WAAA,CAAA,SAAA,EAAA,IAAA,CAAA,QAAA,IAAA,QAAA,CAAA,WAA4E,EAAA,QAAA,CAAA,cAAA,CAAA,CAAA;;QAG5E,iBAAA,GAAA,WAAA,CAAA,SAAA,EAAA,IAAA,CAAA,QAAA,IAAA,QAAoE,CAAA,WAAA,EAAA,QAAA,CAAA,SAAA,CAAA,CAAA;;MAGpE,gBAAA,EAAA;IACA,OAAI,KAAA;AACA,EAAA;;MAGJ,iBAAA,EAAA;IACA,OAAI,IAAA;AACA,EAAA;;SAGJ,KAAA;AACA"}
+{"version":3,"file":"settingsUtils.js","sources":["../../src/utils/settingsUtils.ts"],"sourcesContent":[null],"names":[],"mappings":"kDAEA;;;;;;;;;AASG;AACI,MAAM,eAAe,GAAG,CAC3B,eAAoB,EACpB,WAAmB,EACnB,gBAAyB,EACzB,YAAoB,EACpB,UAAgC,EAChC,YAAkB,KAClB;MACA,CAAA,eAAK,EAAe;AAChB,IAAA,OAAA;;;AAIJ,EAAA,MAAA,kBAAqB,eAAG,EAAe,eAAE,IAAe,EAAI;AAC5D,EAAA,MAAA,WAAM,GAAW,eAAG,EAAe;MAEnC,gBAAI,EAAgB;;AAEhB,IAAA,MAAA,aAAe,CAAA,EAAG,eAAc,WAAK,CAAA,CAAA;AAErC,IAAA,IAAA,yBAAoB,CAAA,KAAU,SAAK,EAAA;AAC/B,MAAA,OAAA,eAAO,CAAA,SAAgB,CAAA;;;QAI3B,WAAI,EAAA;AACA,MAAA,MAAA,SAAM,GAAA,CAAA,CAAA,EAAS,UAAO,CAAA,CAAA,CAAA;YACtB,cAAM,GAAA,WAAiB,CAAA,kBAAqB,CAAA;AAC5C,MAAA,MAAA,KAAA,GAAM,cAAQ,CAAA,wBAA+B,IAAA,WAAY,CAAA,QAAY,EAAA,WAAU,CAAA;AAC/E,MAAA,IAAA,KAAA,KAAI,SAAU,EAAA;AACV,QAAA,OAAA,CAAA,GAAA,CAAA,CAAA,iDAAsD;AACtD,QAAA,OAAA,KAAA;;;AAGR,IAAA,OAAA;SACH;;UACG,QAAA,GAAA,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,EAAA,EAAA,WAAA,CAAA,CAAA;QACA,wBAAqB,CAAA,KAAA,SAAiB,EAAA;AACtC,MAAA,sBAAoB,CAAA,QAAS,CAAA;AACzB,IAAA;;UAGJ,KAAA,GAAA,cAAA,CAAA,eAAA,EAAA,WAAA,CAAA;WACA,KAAM,cAAQ,GAAA,oBAA8B;;;AAGpD;AAEA;;;;;;AAMG,MAAA,0BAAA,GAAA,CAAA,QAAA,EAAA,YAAA,EAAA,UAAA,KAAA;AACH,EAAA,MAAO,WAAM,GAAA,QAAA,EAAA,WACT;AAIA,EAAA,IAAA,CAAA,WAAM,EAAA;IACN,OAAK,KAAA,CAAA;;QAEJ,cAAA,GAAA,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,CAAA,CAAA;AAED,EAAA,MAAA,gBAAoB;AACpB;QAEA,gBAAA,GAAA,WAAA,CAAA,SAAA,EAAA,IAAA,CAAA,QAAA,IAAA,QAAA,CAAA,WAA4E,EAAA,QAAA,CAAA,cAAA,CAAA,CAAA;;QAG5E,iBAAA,GAAA,WAAA,CAAA,SAAA,EAAA,IAAA,CAAA,QAAA,IAAA,QAAoE,CAAA,WAAA,EAAA,QAAA,CAAA,SAAA,CAAA,CAAA;;MAGpE,gBAAA,EAAA;IACA,OAAI,KAAA;AACA,EAAA;;MAGJ,iBAAA,EAAA;IACA,OAAI,IAAA;AACA,EAAA;;SAGJ,KAAA;AACA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/tailwind-design-pro",
-    "version": "12.0.16-alpha.55",
+    "version": "12.0.16-alpha.56",
     "description": "Sample core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -22,8 +22,8 @@
     },
     "dependencies": {
         "@admin-layout/assets": "12.0.16-alpha.36",
-        "@admin-layout/client": "12.0.16-alpha.55",
-        "@admin-layout/tailwind-ui": "12.0.16-alpha.55",
+        "@admin-layout/client": "12.0.16-alpha.56",
+        "@admin-layout/tailwind-ui": "12.0.16-alpha.56",
         "react-favicon": "^0.0.23",
         "react-intl": "^6.1.1",
         "react-responsive": "^10.0.0"
@@ -53,5 +53,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "e874eab61e1653793929285221297b0aa2761a96"
+    "gitHead": "9d608c873fdf63cf3ffd982a8304ecbcad0b92f8"
 }