allow settings in !import lines

src/settings.ts

@@ -19,15 +19,17 @@ function validateName(name: string) {
 }
 
 const settings = {
-  all: function() { return load() },
+  all: load,
 
-  read: function(name: string, defaultValue: any | undefined = undefined) {
+  isValidName: (name: string) => VALID_NAMES.includes(name),
+
+  read: (name: string, defaultValue: any | undefined = undefined) => {
     validateName(name)
     const settings = load()
     return settings[name] || defaultValue
   },
 
-  write: function(name: string, value): any {
+  write: (name: string, value: any) => {
     validateName(name)
 
     if (name === 'services_home') verifyDirectory(value = resolve(value))

src/yamler/yamler.ts

@@ -6,6 +6,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import yaml from 'js-yaml'
 import icons from '~/icons'
+import settings from '~/settings'
 import Import from './import'
 
 export async function loadFile(filePath: string, expressionCallback?: Function | undefined): Promise<Record<string, any>> {
@@ -89,9 +90,14 @@ export default class YamlER {
     }
   }
 
+  private subsituteSettings(filePath: string): string {
+    return filePath.replace(/\$(\w+)/g, (match, name) => settings.isValidName(name) ? settings.read(name) : match)
+  }
+
   private parseImports() {
     this.imports = {}
     this.content = this.content.replace(importRegex, (match, filePath, name) => {
+      filePath = this.subsituteSettings(filePath)
       const yamlImport = new Import({ name, match, filePath, parentFile: this.filePath })
       this.imports[yamlImport.name] = yamlImport
 

tests/fixtures/imports/service.yaml

@@ -1,4 +1,4 @@
-!import ./environment/test/environment.yaml as environment
+!import ./environment/$environment/environment.yaml as environment
 
 environment: !extends environment
   HELLO: world

tests/setup.js

@@ -1,8 +1,18 @@
-import { afterEach, mock } from 'bun:test'
+import { beforeEach, afterEach, mock } from 'bun:test'
 import { evaluatorCache } from '~/staxfile/evaluator'
+import { mkdirSync, rmSync } from 'fs'
+import { join } from 'path'
+import settings from '~/settings'
+
+process.env.STAX_HOME = join(__dirname, '../tmp/.stax-tests')
+
+beforeEach(() => {
+  mkdirSync(process.env.STAX_HOME)
+  settings.write('environment', 'test')
+})
 
 afterEach(() => {
-  // Add manual cleanup of any existing tmp files
   mock.restore()
   evaluatorCache.clear()
+  rmSync(process.env.STAX_HOME, { recursive: true, force: true })
 })

tests/unit/yamler.test.js

@@ -43,6 +43,11 @@ describe('YamlER', () => {
     it('strips _stax_import_ anchors', () => {
       expect(dump(yaml)).not.toContain('_stax_import_')
     })
+
+    it('imports correct env', () => {
+      expect(yaml.services.web.environment.HELLO).toBe('world')
+      expect(yaml.services.web.environment.RAILS_ENV).toBe('test')
+    })
   })
 
   it('handles expressions that reference a value from an attribute set by another expression', async () => {