@rxap/plugin-library 16.0.0-dev.20 → 16.0.0-dev.21

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.0.0-dev.21](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.20...@rxap/plugin-library@16.0.0-dev.21) (2023-09-03)
+
+### Features
+
+- support string interpolation ([dfcdc79](https://gitlab.com/rxap/packages/commit/dfcdc798f8856dae07b2b7704c60dd145d44a65a))
+
 # [16.0.0-dev.20](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.19...@rxap/plugin-library@16.0.0-dev.20) (2023-09-02)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxap/plugin-library",
-  "version": "16.0.0-dev.20",
+  "version": "16.0.0-dev.21",
   "type": "commonjs",
   "executors": "./executors.json",
   "generators": "./generators.json",
@@ -85,13 +85,13 @@
     "nx": "^16.5.0",
     "semver": "^7.3.5",
     "ts-morph": "^18.0.0",
-    "@rxap/plugin-localazy": "16.1.0-dev.6",
-    "@rxap/ts-morph": "0.1.0-dev.2",
-    "@rxap/utilities": "16.0.0-dev.13",
-    "@rxap/workspace-ts-morph": "0.1.0-dev.3"
+    "@rxap/plugin-localazy": "16.1.0-dev.7",
+    "@rxap/ts-morph": "0.1.0-dev.4",
+    "@rxap/utilities": "16.0.0-dev.14",
+    "@rxap/workspace-ts-morph": "0.1.0-dev.4"
   },
   "schematics": "./generators.json",
-  "gitHead": "baf0566162b7bd806644ee954015e7753d236911",
+  "gitHead": "570517e2cea17029b8546b9e03f71a5da274369d",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/executors/run-generator/executor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const plugin_utilities_1 = require("@rxap/plugin-utilities");
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const run_commands_impl_1 = tslib_1.__importDefault(require("nx/src/executors/run-commands/run-commands.impl"));
 function buildParameters(options = {}) {
@@ -20,6 +21,21 @@ function buildParameters(options = {}) {
     }
     return params.join(' ');
 }
+function stringInterpolation(options, params) {
+    if (!options) {
+        return;
+    }
+    for (const [key, value] of Object.entries(options)) {
+        if (typeof value === 'string') {
+            options[key] = value.replace(/\{([^}]+)}/g, (match, property) => {
+                if (!params[property]) {
+                    throw new Error(`Could not find property ${property} in possible string interpolation parameters: ${JSON.stringify(params)}`);
+                }
+                return params[property];
+            });
+        }
+    }
+}
 function runExecutor(options, context) {
     var _a, _b;
     var _c;
@@ -35,6 +51,15 @@ function runExecutor(options, context) {
         if (!options.withoutProjectArgument) {
             (_b = (_c = options.options)['project']) !== null && _b !== void 0 ? _b : (_c['project'] = context.projectName);
         }
+        stringInterpolation(options.options, {
+            workspaceRoot: context.root,
+            projectRoot: (0, plugin_utilities_1.GetProjectRoot)(context),
+            projectSourceRoot: (0, plugin_utilities_1.GetProjectSourceRoot)(context),
+            projectName: context.projectName,
+            configurationName: context.configurationName,
+            cwd: context.cwd,
+            targetName: context.targetName,
+        });
         command += ` ${buildParameters(options.options)}`;
         if (options.dryRun) {
             command += ' --dry-run';

package/src/executors/run-generator/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":";;;AACA,mEAA6D;AAC7D,gHAAkE;AAGlE,SAAS,eAAe,CAAC,UAAmC,EAAE;IAC5D,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,CAAE,GAAG,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACpD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,MAAM,CAAC,IAAI,CAAC,KAAM,GAAI,IAAK,IAAK,EAAE,CAAC,CAAC;aACrC;SACF;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,MAAM,CAAC,IAAI,CAAC,KAAM,GAAI,IAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAE,EAAE,CAAC,CAAC;SACtD;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,KAAM,GAAI,IAAK,KAAM,EAAE,CAAC,CAAC;SACtC;KACF;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,SAA8B,WAAW,CAAC,OAAmC,EAAE,OAAwB;;;;QACrG,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAEtD,IAAI,OAAO,GAAG,QAAS,OAAO,CAAC,SAAU,EAAE,CAAC;QAE5C,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;gBAC/C,OAAO,GAAG,kBAAmB,OAAO,CAAC,SAAU,EAAE,CAAC;aACnD;SACF;QAED,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;QAEvB,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE;YACnC,YAAA,OAAO,CAAC,OAAO,EAAC,SAAS,wCAAT,SAAS,IAAM,OAAO,CAAC,WAAW,EAAC;SACpD;QAED,OAAO,IAAI,IAAK,eAAe,CAAC,OAAO,CAAC,OAAO,CAAE,EAAE,CAAC;QAEpD,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,OAAO,IAAI,YAAY,CAAC;SACzB;QAED,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAElC,OAAO,IAAA,2BAAG,EAAC;YACT,GAAG,EAAE,OAAO,CAAC,IAAI;YACjB,OAAO;YACP,YAAY,EAAE,EAAE;SACjB,EAAE,OAAO,CAAC,CAAC;;CACb;AA9BD,8BA8BC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":"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"}