Fix import regressions: component id, restore_mode, ledc inverted, template lambda, time on_time, ap secrets split

Author: Mo3he

src/components/SettingsPanel.tsx

@@ -98,13 +98,13 @@ export default function SettingsPanel() {
               <label className="toggle-label">
                 <input
                   type="checkbox"
-                  checked={s.useSecretsFallbackAp}
-                  onChange={(e) => update({ useSecretsFallbackAp: e.target.checked })}
+                  checked={s.useSecretsFallbackApSsid && s.useSecretsFallbackApPassword}
+                  onChange={(e) => update({ useSecretsFallbackApSsid: e.target.checked, useSecretsFallbackApPassword: e.target.checked })}
                 />
                 <span className="toggle-text">Use secrets.yaml</span>
               </label>
             </div>
-            {!s.useSecretsFallbackAp && (
+            {!s.useSecretsFallbackApSsid && (
               <>
                 <div className="form-group">
                   <label>AP Name</label>

src/context/ProjectContext.tsx

@@ -34,7 +34,8 @@ const defaultSettings: ProjectSettings = {
   fallbackApEnabled: true,
   fallbackApSsid: '',
   fallbackApPassword: '',
-  useSecretsFallbackAp: false,
+  useSecretsFallbackApSsid: false,
+  useSecretsFallbackApPassword: false,
   statusLedPin: '',
   timeEnabled: false,
   timeTimezone: '',

src/data/components.ts

@@ -624,6 +624,7 @@ export const componentDefinitions: ComponentDefinition[] = [
     configFields: [
       { key: 'name', label: 'ID', type: 'text', required: true, placeholder: 'pwm_output' },
       { key: 'frequency', label: 'Frequency', type: 'text', default: '1000Hz' },
+      { key: 'inverted', label: 'Inverted', type: 'boolean', default: false },
     ],
   },
   {

src/types/index.ts

@@ -190,7 +190,9 @@ export interface ProjectSettings {
   fallbackApEnabled: boolean;
   fallbackApSsid: string;
   fallbackApPassword: string;
-  useSecretsFallbackAp: boolean;
+  useSecretsFallbackApSsid: boolean;
+  useSecretsFallbackApPassword: boolean;
+  _rawTimeExtras?: Record<string, unknown>;
   _rawOnBoot?: unknown;
   statusLedPin: string;
   timeEnabled: boolean;

src/utils/yamlGenerator.ts

@@ -80,8 +80,8 @@ export function generateYaml(project: Project): string {
 
     if (settings.fallbackApEnabled) {
       wifi.ap = {
-        ssid: settings.useSecretsFallbackAp ? '__SECRET__fallback_ap_ssid' : (settings.fallbackApSsid || `${settings.friendlyName} Fallback`),
-        password: settings.useSecretsFallbackAp ? '__SECRET__fallback_ap_password' : (settings.fallbackApPassword || 'fallback123'),
+        ssid: settings.useSecretsFallbackApSsid ? '__SECRET__fallback_ap_ssid' : (settings.fallbackApSsid || `${settings.friendlyName} Fallback`),
+        password: settings.useSecretsFallbackApPassword ? '__SECRET__fallback_ap_password' : (settings.fallbackApPassword || 'fallback123'),
       };
     }
     doc.wifi = wifi;
@@ -288,10 +288,12 @@ export function generateYaml(project: Project): string {
   // ── time (SNTP) ──
   if (settings.timeEnabled) {
     const time: Record<string, unknown> = { platform: 'sntp' };
+    if (settings._rawTimeExtras?.id) time.id = settings._rawTimeExtras.id;
     if (settings.timeTimezone) time.timezone = settings.timeTimezone;
     if (settings.timeServers) {
       time.servers = settings.timeServers.split(',').map((s) => s.trim()).filter(Boolean);
     }
+    if (settings._rawTimeExtras?.on_time) time.on_time = settings._rawTimeExtras.on_time;
     doc.time = [time];
   }
 
@@ -777,6 +779,7 @@ function generateComponentEntry(
       base.name = str(inst.config.name, inst.name);
       // Use original output id from import if present, otherwise auto-generate
       base.output = inst.config._outputId ? String(inst.config._outputId) : `${inst.id}_output`;
+      if (inst.config.restore_mode) base.restore_mode = inst.config.restore_mode;
       break;
     }
     case 'light.neopixelbus': {
@@ -800,6 +803,7 @@ function generateComponentEntry(
       base.platform = 'ledc';
       if (inst.pins.pin != null) base.pin = `GPIO${inst.pins.pin}`;
       base.id = inst.config.name ? String(inst.config.name) : inst.id;
+      if (inst.config.inverted) base.inverted = true;
       if (inst.config.frequency) base.frequency = inst.config.frequency;
       break;
     }
@@ -1414,6 +1418,7 @@ function generateComponentEntry(
       base.platform = 'template';
       base.name = str(inst.config.name, inst.name);
       if (inst.config.device_class) base.device_class = inst.config.device_class;
+      if (inst.config._lambda) base.lambda = inst.config._lambda;
       break;
     }
     case 'binary_sensor.analog_threshold': {
@@ -1505,6 +1510,14 @@ function generateComponentEntry(
     }
   }
 
+  // Generic: emit _yamlId (component id distinct from name), _filters captured from import
+  if (inst.config._yamlId !== undefined && base.id === undefined) {
+    base.id = inst.config._yamlId;
+  }
+  if (inst.config._filters !== undefined && base.filters === undefined) {
+    base.filters = inst.config._filters;
+  }
+
   return base;
 }
 
@@ -1694,7 +1707,7 @@ function str(val: unknown, fallback: string): string {
 /** Generate a secrets.yaml file based on which secret flags are enabled */
 export function generateSecretsYaml(project: Project): string | null {
   const s = project.settings;
-  const anySecrets = s.useSecretsWifi || s.useSecretsApi || s.useSecretsOta || s.useSecretsMqtt || s.useSecretsFallbackAp;
+  const anySecrets = s.useSecretsWifi || s.useSecretsApi || s.useSecretsOta || s.useSecretsMqtt || s.useSecretsFallbackApSsid || s.useSecretsFallbackApPassword;
   if (!anySecrets) return null;
 
   const lines: string[] = [
@@ -1720,8 +1733,8 @@ export function generateSecretsYaml(project: Project): string | null {
     lines.push(`mqtt_password: "${s.mqttPassword || 'YOUR_MQTT_PASSWORD'}"`);
   }
 
-  if (s.useSecretsFallbackAp && s.fallbackApEnabled) {
-    lines.push(`fallback_ap_ssid: "${s.fallbackApSsid || 'YOUR_AP_NAME'}"`);
+  if ((s.useSecretsFallbackApSsid || s.useSecretsFallbackApPassword) && s.fallbackApEnabled) {
+    if (s.useSecretsFallbackApSsid) lines.push(`fallback_ap_ssid: "${s.fallbackApSsid || 'YOUR_AP_NAME'}"`);
     lines.push(`fallback_ap_password: "${s.fallbackApPassword || 'YOUR_AP_PASSWORD'}"`);
   }
 

src/utils/yamlImporter.ts

@@ -203,13 +203,20 @@ export function importYaml(text: string): ImportResult {
     fallbackApEnabled: !!apDoc.ssid,
     fallbackApSsid: isSecret(apDoc.ssid) ? '' : strVal(apDoc.ssid),
     fallbackApPassword: isSecret(apDoc.password) ? '' : strVal(apDoc.password),
-    useSecretsFallbackAp: isSecret(apDoc.ssid) || isSecret(apDoc.password),
+    useSecretsFallbackApSsid: isSecret(apDoc.ssid),
+    useSecretsFallbackApPassword: isSecret(apDoc.password),
     statusLedPin,
     timeEnabled: doc.time !== undefined,
     timeTimezone: strVal(timeDoc.timezone),
     timeServers: Array.isArray(timeDoc.servers)
       ? (timeDoc.servers as unknown[]).map(String).join(', ')
       : '',
+    _rawTimeExtras: (() => {
+      const extras: Record<string, unknown> = {};
+      if (timeDoc.id) extras.id = timeDoc.id;
+      if (timeDoc.on_time) extras.on_time = timeDoc.on_time;
+      return Object.keys(extras).length > 0 ? extras : undefined;
+    })(),
   };
 
   // ── Components ───────────────────────────────────────────────
@@ -296,6 +303,16 @@ export function importYaml(text: string): ImportResult {
         }
       }
 
+      // Generic extra captures: id (separate from name), restore_mode, lambda, filters
+      if (entry.id !== undefined && String(entry.id) !== String(config.name ?? '')) {
+        config._yamlId = entry.id;
+      }
+      if (entry.restore_mode !== undefined && config.restore_mode === undefined) {
+        config.restore_mode = entry.restore_mode;
+      }
+      if (entry.lambda !== undefined) config._lambda = entry.lambda;
+      if (entry.filters !== undefined) config._filters = entry.filters;
+
       // Capture inline action blocks (on_press, on_state, on_value, etc.) so the
       // generator can re-attach them and the original behaviour is preserved.
       const inlineActions: Record<string, unknown> = {};