@celilo/cli 0.1.4 → 0.1.6

package/src/variables/parser.ts

@@ -9,13 +9,19 @@ import type { VariableReference } from './types';
  * Examples:
  * - $self:container_ip
  * - ${self:disk}G
+ * - $self:domains[0]              ← array indexing on $self: refs
  * - $capability:dns_registrar.primary_domain
  * - ${system:base_url}/api
  *
- * Path must start with letter or underscore, not digit
+ * Path must start with letter or underscore, not digit. An optional
+ * [N] suffix indexes into an array variable (currently only
+ * meaningful on $self: refs whose target is `type: array` — e.g.
+ * namecheap's `domains` declared as an array; the manifest's
+ * capability data block can then read `$self:domains[0]` as a
+ * computed alias for the canonical default).
  */
 const VARIABLE_PATTERN =
-  /\$\{(self|system|system_secret|secret|capability):([a-zA-Z_][a-zA-Z0-9_.-]*)\}|\$(self|system|system_secret|secret|capability):([a-zA-Z_][a-zA-Z0-9_.-]*)/g;
+  /\$\{(self|system|system_secret|secret|capability):([a-zA-Z_][a-zA-Z0-9_.-]*(?:\[\d+\])?)\}|\$(self|system|system_secret|secret|capability):([a-zA-Z_][a-zA-Z0-9_.-]*(?:\[\d+\])?)/g;
 
 /**
  * Parse template content to extract variable references
@@ -56,8 +62,9 @@ export function parseVariables(content: string): VariableReference[] {
  */
 export function hasVariables(content: string): boolean {
   // Create new regex without state to avoid issues with global flag
-  // Matches both ${type:path} and $type:path
-  const pattern = /\$\{?(self|system|system_secret|secret|capability):([a-zA-Z_][a-zA-Z0-9_.-]*)/;
+  // Matches both ${type:path} and $type:path (with optional [N] index)
+  const pattern =
+    /\$\{?(self|system|system_secret|secret|capability):([a-zA-Z_][a-zA-Z0-9_.-]*(?:\[\d+\])?)/;
   return pattern.test(content);
 }
 
@@ -69,8 +76,42 @@ export function hasVariables(content: string): boolean {
  */
 export function isValidVariableFormat(variable: string): boolean {
   // Path must start with letter or underscore, not digit
-  // Accepts both ${type:path} and $type:path
+  // Accepts both ${type:path} and $type:path with optional [N] indexing
   const pattern =
-    /^(?:\$\{(self|system|system_secret|secret|capability):[a-zA-Z_][a-zA-Z0-9_.-]*\}|\$(self|system|system_secret|secret|capability):[a-zA-Z_][a-zA-Z0-9_.-]*)$/;
+    /^(?:\$\{(self|system|system_secret|secret|capability):[a-zA-Z_][a-zA-Z0-9_.-]*(?:\[\d+\])?\}|\$(self|system|system_secret|secret|capability):[a-zA-Z_][a-zA-Z0-9_.-]*(?:\[\d+\])?)$/;
   return pattern.test(variable);
 }
+
+/**
+ * Split a variable path into its base name and optional array index.
+ *
+ * Examples:
+ *   parsePath("domains")     → { name: "domains" }
+ *   parsePath("domains[0]")  → { name: "domains", index: 0 }
+ *   parsePath("a.b.c[2]")    → { name: "a.b.c", index: 2 }
+ *
+ * Pure helper used wherever `$self:NAME[N]` semantics need to be
+ * applied to a resolved value (currently the capability-data
+ * resolver in `context.ts` and the lazy-resolution path in
+ * `resolver.ts`).
+ */
+export function parsePath(path: string): { name: string; index?: number } {
+  const match = /^(.+)\[(\d+)\]$/.exec(path);
+  if (!match) return { name: path };
+  return { name: match[1], index: Number.parseInt(match[2], 10) };
+}
+
+/**
+ * Apply an optional `[N]` index to a value. Used by the variable
+ * resolver after looking up a name like `domains` in a config map —
+ * if the original path had `[N]`, we drill into the array.
+ *
+ * Returns `undefined` for out-of-bounds indexes or when an index is
+ * applied to a non-array. Callers turn that into a resolver error.
+ */
+export function applyIndex(value: unknown, index: number | undefined): unknown {
+  if (index === undefined) return value;
+  if (!Array.isArray(value)) return undefined;
+  if (index < 0 || index >= value.length) return undefined;
+  return value[index];
+}

package/src/variables/resolver.test.ts

@@ -29,7 +29,7 @@ const mockDb = {
 const createContext = (overrides?: Partial<ResolutionContext>): ResolutionContext => ({
   moduleId: 'test-module',
   selfConfig: {
-    container_ip: '192.168.0.50',
+    target_ip: '192.168.0.50',
     hostname: 'homebridge',
     cores: '2',
     'resources.machine.cpu': '2',
@@ -69,8 +69,8 @@ describe('resolveVariable', () => {
   test('should resolve self variable', async () => {
     const variable: VariableReference = {
       type: 'self',
-      path: 'container_ip',
-      raw: '$self:container_ip',
+      path: 'target_ip',
+      raw: '$self:target_ip',
     };
     const context = createContext();
 
@@ -245,7 +245,7 @@ describe('resolveVariable', () => {
 
 describe('resolveTemplate', () => {
   test('should resolve template with single variable', async () => {
-    const template = 'ip: $self:container_ip';
+    const template = 'ip: $self:target_ip';
     const context = createContext();
 
     const result = await resolveTemplate(template, context, mockDb);
@@ -259,7 +259,7 @@ describe('resolveTemplate', () => {
   test('should resolve template with multiple variables', async () => {
     const template = `
 hostname: $self:hostname
-ip: $self:container_ip
+ip: $self:target_ip
 domain: $system:network.domain
 `;
     const context = createContext();
@@ -276,7 +276,7 @@ domain: $system:network.domain
 
   test('should resolve template with mixed variable types', async () => {
     const template = `
-container_ip: $self:container_ip
+target_ip: $self:target_ip
 management_ip: $system:management.ip
 dns_server: $capability:dns_external.nameserver
 api_key: $secret:api_key
@@ -287,7 +287,7 @@ api_key: $secret:api_key
 
     expect(result.success).toBe(true);
     if (result.success) {
-      expect(result.content).toContain('container_ip: 192.168.0.50');
+      expect(result.content).toContain('target_ip: 192.168.0.50');
       expect(result.content).toContain('management_ip: 192.168.0.10');
       expect(result.content).toContain('dns_server: ns1.example.com');
       expect(result.content).toContain('api_key: secret123');
@@ -324,7 +324,7 @@ resource "proxmox_lxc" "container" {
   hostname = "$self:hostname"
   cores    = $self:cores
   network {
-    ip = "$self:container_ip/24"
+    ip = "$self:target_ip/24"
     gateway = "$system:management.ip"
   }
   environment = {
@@ -362,7 +362,7 @@ resource "proxmox_lxc" "container" {
 
   test('should return errors for missing variables', async () => {
     const template = `
-ip: $self:container_ip
+ip: $self:target_ip
 missing: $self:missing_var
 another_missing: $secret:missing_secret
 `;
@@ -380,9 +380,9 @@ another_missing: $secret:missing_secret
 
   test('should handle repeated variables', async () => {
     const template = `
-ip1: $self:container_ip
-ip2: $self:container_ip
-ip3: $self:container_ip
+ip1: $self:target_ip
+ip2: $self:target_ip
+ip3: $self:target_ip
 `;
     const context = createContext();
 
@@ -393,7 +393,7 @@ ip3: $self:container_ip
       expect(result.content).toContain('ip1: 192.168.0.50');
       expect(result.content).toContain('ip2: 192.168.0.50');
       expect(result.content).toContain('ip3: 192.168.0.50');
-      expect(result.content).not.toContain('$self:container_ip');
+      expect(result.content).not.toContain('$self:target_ip');
     }
   });
 
@@ -420,7 +420,7 @@ $self:hostname
     const template = 'ansible_host: $self:inventory.ansible_host';
     const context = createContext({
       selfConfig: {
-        container_ip: '10.0.10.10/24',
+        target_ip: '10.0.10.10/24',
         'inventory.ansible_host': '10.0.10.10', // Auto-derived (CIDR stripped)
         'inventory.ansible_user': 'root',
         'inventory.groups': 'test',

package/src/variables/resolver.ts

@@ -1,4 +1,4 @@
-import { parseVariables } from './parser';
+import { applyIndex, parsePath, parseVariables } from './parser';
 import type {
   ResolutionContext,
   ResolveResult,
@@ -173,8 +173,11 @@ export async function resolveVariable(
 
       // Check if value contains unresolved $self: variable (lazy resolution)
       if (typeof value === 'string' && value.startsWith('$self:')) {
-        // Get provider module's config to resolve the variable
-        const selfVarPath = value.substring(6); // Remove "$self:" prefix
+        // Get provider module's config to resolve the variable.
+        // The path can be a plain key ("primary_domain") or include
+        // an array index ("domains[0]") — see parsePath/applyIndex
+        // and the syntax note in the multi-domain DDNS design doc.
+        const { name, index } = parsePath(value.substring(6));
 
         // Get provider module ID
         const providerQuery = db.$client.prepare(
@@ -193,23 +196,38 @@ export async function resolveVariable(
           };
         }
 
-        // Get provider module's config value
+        // Fetch both `value` and `value_json` so we can index into
+        // arrays when the path contained `[N]`.
         const configQuery = db.$client.prepare(
-          'SELECT value FROM module_configs WHERE module_id = ? AND key = ?',
+          'SELECT value, value_json FROM module_configs WHERE module_id = ? AND key = ?',
         );
-        const configResult = configQuery.get(providerResult.id, selfVarPath) as
-          | { value: string }
+        const configResult = configQuery.get(providerResult.id, name) as
+          | { value: string; value_json: string | null }
           | undefined;
 
         if (!configResult) {
           return {
             success: false,
             variable: variable.raw,
-            error: `Provider module '${providerResult.id}' has not configured '${selfVarPath}' (required by capability '${capabilityName}')`,
+            error: `Provider module '${providerResult.id}' has not configured '${name}' (required by capability '${capabilityName}')`,
           };
         }
 
-        return { success: true, value: configResult.value };
+        const rawValue: unknown = configResult.value_json
+          ? JSON.parse(configResult.value_json)
+          : configResult.value;
+        const indexed = applyIndex(rawValue, index);
+        if (indexed === undefined) {
+          return {
+            success: false,
+            variable: variable.raw,
+            error:
+              index === undefined
+                ? `Provider module '${providerResult.id}' has not configured '${name}'`
+                : `'$self:${name}[${index}]' is out of bounds or '${name}' is not an array on '${providerResult.id}'`,
+          };
+        }
+        return { success: true, value: typeof indexed === 'string' ? indexed : String(indexed) };
       }
 
       // Convert value to string

package/src/variables/types.ts

@@ -4,7 +4,7 @@
 
 /**
  * Variable reference parsed from template
- * Example: $self:container_ip -> { type: 'self', path: 'container_ip', raw: '$self:container_ip' }
+ * Example: $self:target_ip -> { type: 'self', path: 'target_ip', raw: '$self:target_ip' }
  */
 export interface VariableReference {
   type: 'self' | 'system' | 'system_secret' | 'secret' | 'capability';

package/tsconfig.json

@@ -4,6 +4,7 @@
     "module": "ESNext",
     "lib": ["ESNext"],
     "moduleResolution": "bundler",
+    "jsx": "react-jsx",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,