@rxap/plugin-library 16.0.0-dev.41 → 16.0.0-dev.42

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 +6 -0
  2. package/README.md +1 -1
  3. package/package.json +12 -8
  4. package/src/executors/run-generator/executor.js +23 -1
  5. package/src/executors/run-generator/executor.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
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.42](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.41...@rxap/plugin-library@16.0.0-dev.42) (2023-11-16)
7
+
8
+ ### Bug Fixes
9
+
10
+ - support custom inline options ([468985a](https://gitlab.com/rxap/packages/commit/468985a004993bb4dcbf6dd6a55aae973c509935))
11
+
6
12
  # [16.0.0-dev.41](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.40...@rxap/plugin-library@16.0.0-dev.41) (2023-10-16)
7
13
 
8
14
  ### 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.13 @rxap/generator-utilities@^1.1.0-dev.19 @rxap/node-utilities@^1.1.0-dev.15 @rxap/plugin-angular@^16.1.0-dev.55 @rxap/plugin-nestjs@^16.1.0-dev.45 @rxap/plugin-utilities@^16.1.0-dev.21 @rxap/ts-morph@* @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-utilities@^0.1.0-dev.23 handlebars@^4.7.7 nx@^16.5.0 semver@^7.5.3 ts-morph@^18.0.0 tslib@2.6.2
22
+ yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1-dev.13 @rxap/generator-utilities@^1.1.0-dev.19 @rxap/node-utilities@^1.1.0-dev.15 @rxap/plugin-angular@^16.1.0-dev.58 @rxap/plugin-nestjs@^16.1.0-dev.45 @rxap/plugin-utilities@^16.1.0-dev.21 @rxap/ts-morph@^0.1.0-dev.18 @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-utilities@^0.1.0-dev.24 handlebars@^4.7.7 nx@^16.5.0 semver@^7.5.3 ts-morph@^18.0.0 tslib@2.6.2
23
23
  ```
24
24
  **Execute the init generator:**
25
25
  ```bash
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.0.0-dev.41",
2
+ "version": "16.0.0-dev.42",
3
3
  "name": "@rxap/plugin-library",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -14,18 +14,18 @@
14
14
  "@rxap/generator-ts-morph": "^1.0.1-dev.13",
15
15
  "@rxap/generator-utilities": "^1.1.0-dev.19",
16
16
  "@rxap/node-utilities": "^1.1.0-dev.15",
17
- "@rxap/plugin-angular": "^16.1.0-dev.55",
17
+ "@rxap/plugin-angular": "^16.1.0-dev.58",
18
18
  "@rxap/plugin-nestjs": "^16.1.0-dev.45",
19
19
  "@rxap/plugin-utilities": "^16.1.0-dev.21",
20
- "@rxap/ts-morph": "*",
20
+ "@rxap/ts-morph": "^0.1.0-dev.18",
21
21
  "@rxap/utilities": "^16.0.0-dev.23",
22
- "@rxap/workspace-utilities": "^0.1.0-dev.23",
22
+ "@rxap/workspace-utilities": "^0.1.0-dev.24",
23
23
  "handlebars": "^4.7.7",
24
24
  "nx": "^16.5.0",
25
25
  "semver": "^7.5.3",
26
26
  "ts-morph": "^18.0.0",
27
27
  "tslib": "2.6.2",
28
- "@rxap/plugin-localazy": "16.1.0-dev.16",
28
+ "@rxap/plugin-localazy": "16.1.0-dev.18",
29
29
  "@rxap/workspace-ts-morph": "0.1.0-dev.12"
30
30
  },
31
31
  "author": {
@@ -62,7 +62,7 @@
62
62
  },
63
63
  {
64
64
  "package": "@rxap/plugin-angular",
65
- "version": "16.1.0-dev.55"
65
+ "version": "16.1.0-dev.58"
66
66
  },
67
67
  {
68
68
  "package": "@rxap/plugin-nestjs",
@@ -76,13 +76,17 @@
76
76
  "package": "@rxap/schematics-utilities",
77
77
  "version": "16.0.0-dev.4"
78
78
  },
79
+ {
80
+ "package": "@rxap/ts-morph",
81
+ "version": "0.1.0-dev.18"
82
+ },
79
83
  {
80
84
  "package": "@rxap/utilities",
81
85
  "version": "16.0.0-dev.23"
82
86
  },
83
87
  {
84
88
  "package": "@rxap/workspace-utilities",
85
- "version": "0.1.0-dev.23"
89
+ "version": "0.1.0-dev.24"
86
90
  }
87
91
  ]
88
92
  },
@@ -97,7 +101,7 @@
97
101
  },
98
102
  "schematics": "./generators.json",
99
103
  "type": "commonjs",
100
- "gitHead": "4618ff1e4cbe6cfd826a154d0f361f83c934900a",
104
+ "gitHead": "e693226c20a89161107a08ef8e5da07abd0ebd7d",
101
105
  "main": "./src/index.js",
102
106
  "types": "./src/index.d.ts"
103
107
  }
package/src/executors/run-generator/executor.js CHANGED
@@ -41,6 +41,28 @@ function stringInterpolation(options, params) {
41
41
  }
42
42
  }
43
43
  }
44
+ function extractFlattenOptions(options) {
45
+ const extracted = {};
46
+ for (const [option, value] of Object.entries(options)) {
47
+ let key = undefined;
48
+ if (option.startsWith('options-')) {
49
+ key = option.replace('options-', '');
50
+ }
51
+ if (option.startsWith('option-')) {
52
+ key = option.replace('option-', '');
53
+ }
54
+ if (option.match(/option[A-Z]/)) {
55
+ key = option.replace(/option([A-Z])/g, (match, letter) => letter.toLowerCase());
56
+ }
57
+ if (option.match(/options[A-Z]/)) {
58
+ key = option.replace(/options([A-Z])/g, (match, letter) => letter.toLowerCase());
59
+ }
60
+ if (key) {
61
+ extracted[key] = value;
62
+ }
63
+ }
64
+ return extracted;
65
+ }
44
66
  function runExecutor(options, context) {
45
67
  var _a, _b;
46
68
  var _c;
@@ -65,7 +87,7 @@ function runExecutor(options, context) {
65
87
  cwd: context.cwd,
66
88
  targetName: context.targetName,
67
89
  });
68
- command += ` ${buildParameters(options.options)}`;
90
+ command += ` ${buildParameters(Object.assign(Object.assign({}, options.options), extractFlattenOptions(options)))}`;
69
91
  if (options.dryRun) {
70
92
  command += ' --dry-run';
71
93
  }
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":"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"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":"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"}