add correct version of resolve_relative

src/staxfile/evaluator.ts

@@ -1,6 +1,7 @@
 import { dasherize, dig, resolve } from '~/utils'
 import { EvaluationContext, ExpressionWarning } from '~/yamler'
 import { symbolRegex } from '~/yamler/symbolizer'
+import { dirname } from 'path'
 import icons from '~/icons'
 import Staxfile from '.'
 import inquirer from 'inquirer'
@@ -44,6 +45,7 @@ export default class Evaluator {
     if (name === 'mount_workspace') return this.mountWorkspace()
     if (name === 'mount_ssh_auth_sock') return this.mountSshAuthSock()
     if (name === 'resolve') return resolve(context.baseDir, args[0])
+    if (name === 'resolve_relative') return resolve(dirname(context.symbol.file), args[0])
     if (name === 'user') return process.env.USER || ''
     if (name === 'user_id') return process.getuid()
     if (name === 'dasherize') return dasherize(args[0])

src/yamler/index.ts

@@ -20,7 +20,7 @@ export interface EvaluationContext {
   baseDir: string
   attributes: Record<string, any>
   path: string
-  symbol: object
+  symbol: Record<string, any>
   name: string
   args: string[]
 }

tests/fixtures/imports/base.yaml

@@ -1,5 +1,6 @@
+!import sub/sub.yaml as sub
 
-stax:
+stax: !extends sub
   app: base_app
   vars:
     ruby_version: 1.0.0

tests/fixtures/imports/sub/sub.yaml

@@ -0,0 +1,2 @@
+with_resolve_relative: ${{ resolve_relative . }}
+with_resolve: ${{ resolve . }}

tests/unit/staxfile.test.js

@@ -36,6 +36,8 @@ describe('Staxfile', () => {
         rails_server_port: 3000
       },
       requires: [ 'mysql', 'caddy' ],
+      with_resolve: fixturesDir,
+      with_resolve_relative: join(fixturesDir, 'imports/sub'),
       after_setup: 'echo rails_app /workspaces/rails_app'
     })
   })