Replace parameters as string and object (#22)

* Replace parameters as string and object

* Bump version

* Also replace strings with suffix

* Remove only

assert/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/assert",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Extra assert library",
   "type": "module",
   "repository": {

dtc-aws-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc-aws-plugin",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "AWS plugin for Declarative TestCases",
   "repository": {
     "type": "git",

dtc-mysql-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc-mysql-plugin",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "MySQL plugin for Declarative TestCases",
   "repository": {
     "type": "git",

dtc-playwright-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc-playwright-plugin",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Playwright plugin for Declarative TestCases",
   "repository": {
     "type": "git",

dtc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/dtc",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Declarative TestCases",
   "repository": {
     "type": "git",

dtc/src/index.ts

@@ -7,8 +7,6 @@ export type * from './domain'
 export * from './utils.js'
 export * from './config.js'
 export * from './loader.js'
-export * as DisableNetConnectPlugin from './plugins/disable-net-connect-plugin.js'
-export * as FunctionCallPlugin from './plugins/function-call-plugin.js'
 
 export const defaultTestRunner = async (testCaseExecutions: TestCaseExecution[], plugins: string[]) => {
   for (const {filePath, testCase} of testCaseExecutions) {

dtc/src/loader.ts

@@ -42,24 +42,39 @@ const recursiveMap = (obj: any, callback: (v: any) => any): any => {
   return callback(obj)
 }
 
-const replacePlaceholders = (obj: any, params: any) =>
-  recursiveMap(obj, (value: string | number | boolean) => {
+const getValueByPath = (path: string, params: Record<string, unknown>): unknown => {
+  const attributes = path.split('.')
+  let resolvedValue: unknown = params
+
+  for (const attribute of attributes) {
+    if (resolvedValue && typeof resolvedValue === 'object') {
+      resolvedValue = (resolvedValue as Record<string, unknown>)[attribute]
+    } else {
+      throw new Error(`Invalid parameter property: ${attribute} (${path}).`)
+    }
+  }
+
+  return resolvedValue
+}
+
+const replacePlaceholders = (template: unknown, params: Record<string, unknown>) =>
+  recursiveMap(template, (value: string | number | boolean) => {
     if (typeof value !== 'string') {
       return value
     }
 
-    return value.replace(/\${(.*?)}/g, (match, group) => {
-      const path = group.split('.')
-      let value = params
-      for (const prop of path) {
-        if (value && typeof value === 'object') {
-          value = value[prop]
-        } else {
-          return match
-        }
+    const regex = new RegExp(/\${(.*?)}/g)
+    const matches = regex.exec(value)
+
+    if (matches !== null) {
+      if (matches[0] !== matches.input) {
+        return value.replace(regex, (_, path) => getValueByPath(path, params) as string)
       }
-      return value
-    })
+
+      return getValueByPath(matches[1], params)
+    }
+
+    return value
   })
 
 const resolveParameters = (testCaseExecution: TestCaseExecution): TestCaseExecution[] => {

dtc/src/plugins/disable-net-connect-plugin.ts

@@ -1,3 +1,5 @@
 import nock from 'nock'
 
-nock.disableNetConnect()
+export const arrange = () => {
+  nock.disableNetConnect()
+} 

dtc/test/fixtures/t1.dtc.ts

@@ -11,10 +11,10 @@ export default {
     import: 'syncFunction',
     from: 'functions.js',
     arguments: [
-      {a: '${a}', d: '${c.d}'},
+      {a: 'content ${a} more ${b}', b: '${b} content', c: '${c}', d: '${c.d}'},
     ],
   },
   assert: {
-    a: '${b}',
+    a: 'content ${a} more ${b}'
   },
 }

dtc/test/loader.test.ts

@@ -32,8 +32,8 @@ test('It replaces parameters placeholders', async () => {
   nodeAssert.equal(`${__dirname}/./fixtures/t1.dtc.ts`, testCaseExecutions[0].filePath)
   nodeAssert.equal('Test 1', testCaseExecutions[0].testCase.name)
 
-  nodeAssert.deepStrictEqual(testCaseExecutions[0].testCase.act?.arguments, [{a: 'b', d: 'e'}])
-  nodeAssert.deepStrictEqual(testCaseExecutions[0].testCase.assert, {a: 'b'})
+  nodeAssert.deepStrictEqual(testCaseExecutions[0].testCase.act?.arguments, [{a: 'content b more b', b: 'b content', c: {d: 'e'}, d: 'e'}])
+  nodeAssert.deepStrictEqual(testCaseExecutions[0].testCase.assert, {a: 'content b more b'})
 })
 
 test('It replaces multiple parameters placeholders', async () => {

nock-aws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/nock-aws",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "AWS Request mocker based on Nock",
   "repository": {
     "type": "git",

yaml/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgauge/yaml",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "YAML parser with extra tags",
   "repository": {
     "type": "git",