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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/README.md +1 -1
  3. package/package.json +23 -27
  4. package/src/executors/run-generator/executor.js +25 -0
  5. package/src/executors/run-generator/executor.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,16 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [16.0.0-dev.22](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.21...@rxap/plugin-library@16.0.0-dev.22) (2023-09-03)
7
+
8
+ **Note:** Version bump only for package @rxap/plugin-library
9
+
10
+ # [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)
11
+
12
+ ### Features
13
+
14
+ - support string interpolation ([dfcdc79](https://gitlab.com/rxap/packages/commit/dfcdc798f8856dae07b2b7704c60dd145d44a65a))
15
+
6
16
  # [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)
7
17
 
8
18
  ### Bug Fixes
package/README.md CHANGED
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-library
19
19
  ```
20
20
  **Install peer dependencies:**
21
21
  ```bash
22
- yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1-dev.6 @rxap/generator-utilities@^1.1.0-dev.7 @rxap/node-utilities@^1.1.0-dev.4 @rxap/plugin-angular@^16.1.0-dev.13 @rxap/plugin-nestjs@^16.1.0-dev.12 @rxap/plugin-utilities@^16.1.0-dev.9 @rxap/workspace-utilities@^0.1.0-dev.7 nx@^16.5.0 semver@^7.3.5 ts-morph@^18.0.0
22
+ yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1-dev.8 @rxap/generator-utilities@^1.1.0-dev.9 @rxap/node-utilities@^1.1.0-dev.6 @rxap/plugin-angular@^16.1.0-dev.16 @rxap/plugin-nestjs@^16.1.0-dev.15 @rxap/plugin-utilities@^16.1.0-dev.11 @rxap/workspace-utilities@^0.1.0-dev.10 handlebars@^4.7.7 nx@^16.5.0 semver@^7.3.5 ts-morph@^18.0.0
23
23
  ```
24
24
  **Execute the init generator:**
25
25
  ```bash
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rxap/plugin-library",
3
- "version": "16.0.0-dev.20",
3
+ "version": "16.0.0-dev.22",
4
4
  "type": "commonjs",
5
5
  "executors": "./executors.json",
6
6
  "generators": "./generators.json",
@@ -12,31 +12,31 @@
12
12
  "packageGroup": [
13
13
  {
14
14
  "package": "@rxap/generator-ts-morph",
15
- "version": "1.0.1-dev.6"
15
+ "version": "1.0.1-dev.8"
16
16
  },
17
17
  {
18
18
  "package": "@rxap/generator-utilities",
19
- "version": "1.1.0-dev.7"
19
+ "version": "1.1.0-dev.9"
20
20
  },
21
21
  {
22
22
  "package": "@rxap/node-utilities",
23
- "version": "1.1.0-dev.4"
23
+ "version": "1.1.0-dev.6"
24
24
  },
25
25
  {
26
26
  "package": "@rxap/plugin-angular",
27
- "version": "16.1.0-dev.13"
27
+ "version": "16.1.0-dev.16"
28
28
  },
29
29
  {
30
30
  "package": "@rxap/plugin-nestjs",
31
- "version": "16.1.0-dev.12"
31
+ "version": "16.1.0-dev.15"
32
32
  },
33
33
  {
34
34
  "package": "@rxap/plugin-utilities",
35
- "version": "16.1.0-dev.9"
35
+ "version": "16.1.0-dev.11"
36
36
  },
37
37
  {
38
38
  "package": "@rxap/workspace-utilities",
39
- "version": "0.1.0-dev.7"
39
+ "version": "0.1.0-dev.10"
40
40
  },
41
41
  {
42
42
  "package": "@rxap/schematics-utilities",
@@ -67,31 +67,27 @@
67
67
  "email": "mmuenker@digitaix.com"
68
68
  },
69
69
  "dependencies": {
70
- "handlebars": "4.7.7",
71
- "ignore": "^5.2.4",
72
- "process": "0.11.10",
73
- "tslib": "2.5.3",
74
- "yaml": "2.3.1"
70
+ "tslib": "2.6.2"
75
71
  },
76
72
  "peerDependencies": {
77
73
  "@nx/devkit": "^16.5.0",
78
- "@rxap/generator-ts-morph": "^1.0.1-dev.6",
79
- "@rxap/generator-utilities": "^1.1.0-dev.7",
80
- "@rxap/node-utilities": "^1.1.0-dev.4",
81
- "@rxap/plugin-angular": "^16.1.0-dev.13",
82
- "@rxap/plugin-nestjs": "^16.1.0-dev.12",
83
- "@rxap/plugin-utilities": "^16.1.0-dev.9",
84
- "@rxap/workspace-utilities": "^0.1.0-dev.7",
74
+ "@rxap/generator-ts-morph": "^1.0.1-dev.8",
75
+ "@rxap/generator-utilities": "^1.1.0-dev.9",
76
+ "@rxap/node-utilities": "^1.1.0-dev.6",
77
+ "@rxap/plugin-angular": "^16.1.0-dev.16",
78
+ "@rxap/plugin-nestjs": "^16.1.0-dev.15",
79
+ "@rxap/plugin-utilities": "^16.1.0-dev.11",
80
+ "@rxap/workspace-utilities": "^0.1.0-dev.10",
81
+ "handlebars": "^4.7.7",
85
82
  "nx": "^16.5.0",
86
83
  "semver": "^7.3.5",
87
84
  "ts-morph": "^18.0.0",
88
- "@rxap/plugin-localazy": "16.1.0-dev.6",
89
- "@rxap/ts-morph": "0.1.0-dev.2",
90
- "@rxap/utilities": "16.0.0-dev.13",
91
- "@rxap/workspace-ts-morph": "0.1.0-dev.3"
85
+ "@rxap/plugin-localazy": "16.1.0-dev.8",
86
+ "@rxap/ts-morph": "0.1.0-dev.5",
87
+ "@rxap/utilities": "16.0.0-dev.15",
88
+ "@rxap/workspace-ts-morph": "0.1.0-dev.5"
92
89
  },
93
90
  "schematics": "./generators.json",
94
- "gitHead": "baf0566162b7bd806644ee954015e7753d236911",
95
- "main": "./src/index.js",
96
- "types": "./src/index.d.ts"
91
+ "gitHead": "b6e1ecbccc89aae6de3dc72b0206374dbaa44e69",
92
+ "main": "./src/index.js"
97
93
  }
package/src/executors/run-generator/executor.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
+ const plugin_utilities_1 = require("@rxap/plugin-utilities");
4
5
  const workspace_utilities_1 = require("@rxap/workspace-utilities");
5
6
  const run_commands_impl_1 = tslib_1.__importDefault(require("nx/src/executors/run-commands/run-commands.impl"));
6
7
  function buildParameters(options = {}) {
@@ -20,6 +21,21 @@ function buildParameters(options = {}) {
20
21
  }
21
22
  return params.join(' ');
22
23
  }
24
+ function stringInterpolation(options, params) {
25
+ if (!options) {
26
+ return;
27
+ }
28
+ for (const [key, value] of Object.entries(options)) {
29
+ if (typeof value === 'string') {
30
+ options[key] = value.replace(/\{([^}]+)}/g, (match, property) => {
31
+ if (!params[property]) {
32
+ throw new Error(`Could not find property ${property} in possible string interpolation parameters: ${JSON.stringify(params)}`);
33
+ }
34
+ return params[property];
35
+ });
36
+ }
37
+ }
38
+ }
23
39
  function runExecutor(options, context) {
24
40
  var _a, _b;
25
41
  var _c;
@@ -35,6 +51,15 @@ function runExecutor(options, context) {
35
51
  if (!options.withoutProjectArgument) {
36
52
  (_b = (_c = options.options)['project']) !== null && _b !== void 0 ? _b : (_c['project'] = context.projectName);
37
53
  }
54
+ stringInterpolation(options.options, {
55
+ workspaceRoot: context.root,
56
+ projectRoot: (0, plugin_utilities_1.GetProjectRoot)(context),
57
+ projectSourceRoot: (0, plugin_utilities_1.GetProjectSourceRoot)(context),
58
+ projectName: context.projectName,
59
+ configurationName: context.configurationName,
60
+ cwd: context.cwd,
61
+ targetName: context.targetName,
62
+ });
38
63
  command += ` ${buildParameters(options.options)}`;
39
64
  if (options.dryRun) {
40
65
  command += ' --dry-run';
package/src/executors/run-generator/executor.js.map CHANGED
@@ -1 +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"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":"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"}