@aws/nx-plugin 0.17.0 → 0.18.2
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.
- package/README.md +128 -37
- package/generators.json +30 -9
- package/package.json +1 -1
- package/src/cloudscape-website/app/__snapshots__/generator.spec.ts.snap +2 -0
- package/src/cloudscape-website/app/files/common/constructs/src/core/static-website.ts.template +1 -0
- package/src/cloudscape-website/app/generator.d.ts +2 -0
- package/src/cloudscape-website/app/generator.js +19 -10
- package/src/cloudscape-website/app/generator.js.map +1 -1
- package/src/cloudscape-website/cognito-auth/__snapshots__/generator.spec.ts.snap +2 -0
- package/src/cloudscape-website/cognito-auth/generator.d.ts +2 -0
- package/src/cloudscape-website/cognito-auth/generator.js +10 -4
- package/src/cloudscape-website/cognito-auth/generator.js.map +1 -1
- package/src/cloudscape-website/runtime-config/__snapshots__/generator.spec.ts.snap +2 -1
- package/src/cloudscape-website/runtime-config/generator.d.ts +2 -0
- package/src/cloudscape-website/runtime-config/generator.js +5 -0
- package/src/cloudscape-website/runtime-config/generator.js.map +1 -1
- package/src/infra/app/__snapshots__/generator.spec.ts.snap +15 -20
- package/src/infra/app/files/app/src/main.ts.template +2 -3
- package/src/infra/app/generator.d.ts +2 -0
- package/src/infra/app/generator.js +12 -5
- package/src/infra/app/generator.js.map +1 -1
- package/src/license/generator.d.ts +2 -0
- package/src/license/generator.js +5 -0
- package/src/license/generator.js.map +1 -1
- package/src/license/sync/generator.d.ts +1 -1
- package/src/license/sync/generator.js +3 -1
- package/src/license/sync/generator.js.map +1 -1
- package/src/py/fast-api/generator.d.ts +2 -0
- package/src/py/fast-api/generator.js +12 -7
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/generator.d.ts +2 -0
- package/src/py/fast-api/react/generator.js +8 -4
- package/src/py/fast-api/react/generator.js.map +1 -1
- package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap +66 -0
- package/src/py/lambda-function/files/common/constructs/src/app/lambda-functions/__constructFunctionKebabCase__.ts.template +24 -0
- package/src/py/lambda-function/files/handler/__lambdaFunctionSnakeCase__.py.template +34 -0
- package/src/py/lambda-function/files/tests/test___lambdaFunctionSnakeCase__.py.template +2 -0
- package/src/py/lambda-function/generator.d.ts +27 -0
- package/src/py/lambda-function/generator.js +143 -0
- package/src/py/lambda-function/generator.js.map +1 -0
- package/src/py/lambda-function/schema.d.ts +53 -0
- package/src/py/lambda-function/schema.json +83 -0
- package/src/py/project/generator.d.ts +2 -0
- package/src/py/project/generator.js +8 -3
- package/src/py/project/generator.js.map +1 -1
- package/src/trpc/backend/generator.d.ts +2 -0
- package/src/trpc/backend/generator.js +12 -6
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/generator.d.ts +2 -0
- package/src/trpc/react/generator.js +5 -0
- package/src/trpc/react/generator.js.map +1 -1
- package/src/ts/lib/generator.d.ts +2 -0
- package/src/ts/lib/generator.js +6 -2
- package/src/ts/lib/generator.js.map +1 -1
- package/src/utils/__snapshots__/shared-constructs.spec.ts.snap +90 -0
- package/src/utils/files/common/constructs/src/core/app.ts.template +24 -0
- package/src/utils/files/common/constructs/src/core/index.ts.template +1 -0
- package/src/utils/http-api.js +5 -5
- package/src/utils/http-api.js.map +1 -1
- package/src/utils/metrics.d.ts +13 -0
- package/src/utils/metrics.js +49 -0
- package/src/utils/metrics.js.map +1 -0
- package/src/utils/names.d.ts +1 -0
- package/src/utils/names.js +4 -1
- package/src/utils/names.js.map +1 -1
- package/src/utils/nx.d.ts +8 -6
- package/src/utils/nx.js +27 -8
- package/src/utils/nx.js.map +1 -1
- package/src/utils/object.d.ts +9 -0
- package/src/utils/object.js +15 -0
- package/src/utils/object.js.map +1 -0
- package/src/utils/shared-constructs-constants.d.ts +9 -0
- package/src/utils/shared-constructs-constants.js +13 -0
- package/src/utils/shared-constructs-constants.js.map +1 -0
- package/src/utils/shared-constructs.d.ts +0 -5
- package/src/utils/shared-constructs.js +19 -24
- package/src/utils/shared-constructs.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +1 -1
- package/src/utils/versions.js.map +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TRPC_REACT_GENERATOR_INFO = void 0;
|
|
3
4
|
exports.reactGenerator = reactGenerator;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
/**
|
|
@@ -14,6 +15,9 @@ const versions_1 = require("../../utils/versions");
|
|
|
14
15
|
const ast_1 = require("../../utils/ast");
|
|
15
16
|
const names_1 = require("../../utils/names");
|
|
16
17
|
const format_1 = require("../../utils/format");
|
|
18
|
+
const nx_1 = require("../../utils/nx");
|
|
19
|
+
const metrics_1 = require("../../utils/metrics");
|
|
20
|
+
exports.TRPC_REACT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
17
21
|
function reactGenerator(tree, options) {
|
|
18
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
23
|
var _a;
|
|
@@ -124,6 +128,7 @@ function reactGenerator(tree, options) {
|
|
|
124
128
|
]
|
|
125
129
|
: []),
|
|
126
130
|
]), (0, versions_1.withVersions)(['@smithy/types']));
|
|
131
|
+
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TRPC_REACT_GENERATOR_INFO]);
|
|
127
132
|
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
128
133
|
return () => {
|
|
129
134
|
(0, devkit_1.installPackagesTask)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":";;;AA+CA,wCA+TC;;AA9WD;;;GAGG;AACH,uCAQoB;AAEpB,2CAcoB;AACpB,iFAA2F;AAC3F,qDAAqD;AACrD,mDAAoD;AACpD,yCAMyB;AACzB,6CAAgD;AAChD,+CAA0D;AAC1D,uCAAmE;AACnE,iDAAsE;AAEzD,QAAA,yBAAyB,GACpC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B,SAAsB,cAAc,CAClC,IAAU,EACV,OAA6B;;;QAE7B,MAAM,qBAAqB,GAAG,IAAA,iCAAwB,EACpD,IAAI,EACJ,OAAO,CAAC,mBAAmB,CAC5B,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;QACF,uDAAuD;QACvD,MAAM,OAAO,GAAG,MAAC,oBAAoB,CAAC,QAAgB,0CAAE,OAAO,CAAC;QAChE,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,mBAAmB,GAAG,IAAA,wBAAY,EAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAErE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,qBAAqB,CAAC,IAAI,gCAExB,OAAO,EACP,gBAAgB,EAAE,IAAA,mBAAW,EAAC,OAAO,CAAC,IACnC,OAAO,KACV,mBAAmB,EAAE,IAAA,wBAAY,EAAC,OAAO,CAAC,kBAAkB,CAAC,KAE/D;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;QAEF,oEAAoE;QACpE,IACE,CAAC,IAAI,CAAC,MAAM,CACV,IAAA,0BAAiB,EACf,qBAAqB,CAAC,UAAU,EAChC,YAAY,EACZ,yBAAyB,CAC1B,CACF,EACD,CAAC;YACD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,qDAAqD,CACtD,EACD,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,YAAY,CAAC,EACjE,EAAE,CACH,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,uCAAuC,CAAC,EACrE,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5D,EAAE,CACH,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;YACjC,OAAO,EAAE,OAAO,CAAC,mBAAmB;SACrC,CAAC,CAAC;QAEH,kBAAkB;QAClB,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,qBAAqB,CAAC,UAAU,EAChC,UAAU,CACX,CAAC;QACF,IAAA,qBAAe,EACb,IAAI,EACJ,WAAW,EACX,qBAAqB,EACrB,kCAAkC,CACnC,CAAC;QACF,IAAA,qBAAe,EACb,IAAI,EACJ,WAAW,EACX,qBAAqB,EACrB,0BAA0B,CAC3B,CAAC;QAEF,8CAA8C;QAC9C,MAAM,sBAAsB,GAC1B,IAAA,WAAK,EACH,IAAI,EACJ,WAAW,EACX,uDAAuD,CACxD,CAAC,MAAM,GAAG,CAAC,CAAC;QAEf,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,IAAA,aAAO,EACL,IAAI,EACJ,WAAW,EACX,sDAAsD,EACtD,CAAC,IAA2B,EAAE,EAAE,CAC9B,IAAA,oCAA8B,EAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,CAAC,CAChE,CAAC;QACJ,CAAC;QAED,8CAA8C;QAC9C,MAAM,WAAW,GACf,IAAA,WAAK,EACH,IAAI,EACJ,WAAW,EACX,uDAAuD,CACxD,CAAC,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAA,aAAO,EACL,IAAI,EACJ,WAAW,EACX,sDAAsD,EACtD,CAAC,IAA2B,EAAE,EAAE,CAC9B,IAAA,oCAA8B,EAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,CAAC,CAChE,CAAC;QACJ,CAAC;QACD,sBAAsB;QACtB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,qBAAqB,CAAC,UAAU,EAChC,qCAAqC,CACtC,CAAC;QACF,kCAAkC;QAClC,IAAA,2BAAqB,EACnB,IAAI,EACJ,YAAY,EACZ,CAAC,0BAA0B,CAAC,EAC5B,gBAAgB,CACjB,CAAC;QACF,IAAA,2BAAqB,EACnB,IAAI,EACJ,YAAY,EACZ;YACE,gBAAgB,gBAAgB,WAAW;YAC3C,cAAc,gBAAgB,SAAS;SACxC,EACD,mBAAmB,CACpB,CAAC;QACF,qDAAqD;QACrD,IAAA,aAAO,EACL,IAAI,EACJ,YAAY,EACZ,4CAA4C,EAC5C,CAAC,IAAI,EAAE,EAAE;YACP,MAAM,kBAAkB,GAAI,IAAgC,CAAC,UAAU,CAAC;YACxE,IACE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,OAAO,EAAE,MAAK,gBAAgB,CAAA,EAAA,CAAC,EACtE,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,WAAW,GAAG,oBAAO,CAAC,wBAAwB,CAClD,oBAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,EAC1C,oBAAO,CAAC,oBAAoB,CAC1B,oBAAO,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,EACpD;gBACE,oBAAO,CAAC,uBAAuB,CAC7B,oBAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,WAAW,CAAC,CACzD;gBACD,oBAAO,CAAC,uBAAuB,CAC7B,oBAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,SAAS,CAAC,CACvD;aACF,EACD,EAAE,CACH,CACF,CAAC;YACF,OAAO,oBAAO,CAAC,6BAA6B,CAC1C,CAAC,GAAG,kBAAkB,EAAE,WAAW,CAAC,EACpC,IAAI,CACL,CAAC;QACJ,CAAC,CACF,CAAC;QACF,iCAAiC;QACjC,MAAM,uBAAuB,GAAG,IAAA,0BAAiB,EAC/C,qBAAqB,CAAC,UAAU,EAChC,gDAAgD,CACjD,CAAC;QACF,cAAc;QACd,IAAA,2BAAqB,EACnB,IAAI,EACJ,uBAAuB,EACvB,CAAC,kBAAkB,CAAC,EACpB,8BAA8B,CAC/B,CAAC;QACF,IAAA,qBAAe,EAAC,IAAI,EAAE,uBAAuB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACzE,+DAA+D;QAC/D,MAAM,gBAAgB,GACpB,IAAA,WAAK,EACH,IAAI,EACJ,uBAAuB,EACvB,mGAAmG,CACpG,CAAC,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,IAAA,aAAO,EACL,IAAI,EACJ,uBAAuB,EACvB,uBAAuB,EACvB,CAAC,IAAW,EAAE,EAAE;gBACd,MAAM,kBAAkB,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChD,MAAM,iBAAiB,GAAG,oBAAO,CAAC,uBAAuB,CACvD,SAAS,EACT,oBAAO,CAAC,6BAA6B,CACnC;oBACE,oBAAO,CAAC,yBAAyB,CAC/B,eAAe,EACf,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,oBAAoB,CAC1B,oBAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAC5C,SAAS,EACT,EAAE,CACH,CACF;iBACF,EACD,sBAAS,CAAC,KAAK,CAChB,CACF,CAAC;gBACF,oEAAoE;gBACpE,kBAAkB,CAAC,MAAM,CACvB,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAC7B,CAAC,EACD,iBAAiB,CAClB,CAAC;gBACF,OAAO,oBAAO,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;YACvD,CAAC,CACF,CAAC;QACJ,CAAC;QACD,uCAAuC;QACvC,MAAM,eAAe,GACnB,IAAA,WAAK,EACH,IAAI,EACJ,uBAAuB,EACvB,6HAA6H,gBAAgB,iCAAiC,CAC/K,CAAC,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,gEAAgE;YAChE,IAAA,aAAO,EACL,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,CAAC,IAAqB,EAAE,EAAE;;gBACxB,MAAM,kBAAkB,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,UAAU,CAAC;oBACnE,CAAC,CAAC,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU;oBAC7B,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;gBACpB,OAAO,oBAAO,CAAC,qBAAqB,CAClC,oBAAO,CAAC,gBAAgB,CACtB,oBAAO,CAAC,uBAAuB,CAC7B,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,EACpC,oBAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAC3C,EACD,oBAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CACb,EACzB,SAAS,EACT,oBAAO,CAAC,mBAAmB,CAAC;oBAC1B,oBAAO,CAAC,kBAAkB,CACxB,oBAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,oBAAO,CAAC,mBAAmB,CACzB,SAAS,EACT,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,oBAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CACrC,EACD,oBAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAC3C,CACF,CACF;iBACF,CAAC,CACH,EACD;oBACE,IAAA,uBAAU,EAAC,kBAAkB,CAAC;wBAC9B,IAAA,yBAAY,EAAC,kBAAkB,CAAC;wBAChC,IAAA,0BAAa,EAAC,kBAAkB,CAAC;wBACjC,IAAA,oCAAuB,EAAC,kBAAkB,CAAC;wBAC3C,IAAA,4BAAe,EAAC,kBAAkB,CAAC;wBACjC,CAAC,CAAC,kBAAkB;wBACpB,CAAC,CAAC,oBAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,kBAAkB,CAAC;iBAC/D,EACD,oBAAO,CAAC,uBAAuB,CAC7B,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,8BAA8B,CACpC,oBAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,EACpC,oBAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAC3C,EACD,oBAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CACb,CAC1B,CACF,CACF,CAAC;YACJ,CAAC,CACF,CAAC;QACJ,CAAC;QACD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;YACX,cAAc;YACd,4BAA4B;YAC5B,uBAAuB;YACvB,GAAI,CAAC,OAAO,CAAC,IAAI,KAAK,KAAK;gBACzB,CAAC,CAAC;oBACE,gBAAgB;oBAChB,WAAW;oBACX,kCAAkC;oBAClC,+CAA+C;oBAC/C,oBAAoB;iBACrB;gBACH,CAAC,CAAC,EAAE,CAAS;SAChB,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,eAAe,CAAC,CAAC,CAChC,CAAC;QAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,iCAAyB,CAAC,CAAC,CAAC;QAEzE,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AACD,kBAAe,cAAc,CAAC"}
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { GeneratorCallback, Tree } from '@nx/devkit';
|
|
6
6
|
import { TsLibGeneratorSchema } from './schema';
|
|
7
|
+
import { NxGeneratorInfo } from '../../utils/nx';
|
|
8
|
+
export declare const TS_LIB_GENERATOR_INFO: NxGeneratorInfo;
|
|
7
9
|
export interface TsLibDetails {
|
|
8
10
|
/**
|
|
9
11
|
* Full package name including scope (eg @foo/bar)
|
package/src/ts/lib/generator.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.tsLibGenerator = exports.getTsLibDetails = void 0;
|
|
3
|
+
exports.tsLibGenerator = exports.getTsLibDetails = exports.TS_LIB_GENERATOR_INFO = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
/**
|
|
6
6
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
@@ -13,7 +13,10 @@ const ts_project_utils_1 = require("./ts-project-utils");
|
|
|
13
13
|
const names_1 = require("../../utils/names");
|
|
14
14
|
const path_1 = require("path");
|
|
15
15
|
const format_1 = require("../../utils/format");
|
|
16
|
+
const object_1 = require("../../utils/object");
|
|
16
17
|
const nx_1 = require("../../utils/nx");
|
|
18
|
+
const metrics_1 = require("../../utils/metrics");
|
|
19
|
+
exports.TS_LIB_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
17
20
|
/**
|
|
18
21
|
* Returns details about the TS library to be created
|
|
19
22
|
*/
|
|
@@ -65,7 +68,7 @@ const tsLibGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, void
|
|
|
65
68
|
},
|
|
66
69
|
};
|
|
67
70
|
delete targets['lint'];
|
|
68
|
-
projectConfiguration.targets = (0,
|
|
71
|
+
projectConfiguration.targets = (0, object_1.sortObjectKeys)(targets);
|
|
69
72
|
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
|
|
70
73
|
(0, devkit_1.updateJson)(tree, 'nx.json', (nxJson) => {
|
|
71
74
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
@@ -108,6 +111,7 @@ const tsLibGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, void
|
|
|
108
111
|
];
|
|
109
112
|
return nxJson;
|
|
110
113
|
});
|
|
114
|
+
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_LIB_GENERATOR_INFO]);
|
|
111
115
|
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
112
116
|
return () => {
|
|
113
117
|
if (!schema.skipInstall) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAYoB;AAEpB,+BAA0C;AAC1C,qDAA0D;AAC1D,yDAAwD;AACxD,6CAAgD;AAChD,+BAAgC;AAChC,+CAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
|
2
|
+
|
|
3
|
+
exports[`shared-constructs utils > sharedConstructsGenerator > should generate shared constructs when they do not exist > packages/common/constructs/src/app/index.ts 1`] = `""`;
|
|
4
|
+
|
|
5
|
+
exports[`shared-constructs utils > sharedConstructsGenerator > should generate shared constructs when they do not exist > packages/common/constructs/src/core/app.ts 1`] = `
|
|
6
|
+
"import { App as _App, AppProps, Aspects, IAspect, Stack } from 'aws-cdk-lib';
|
|
7
|
+
import { IConstruct } from 'constructs';
|
|
8
|
+
|
|
9
|
+
export class App extends _App {
|
|
10
|
+
constructor(props?: AppProps) {
|
|
11
|
+
super(props);
|
|
12
|
+
|
|
13
|
+
Aspects.of(this).add(new MetricsAspect());
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Adds information to CloudFormation stack descriptions to provide usage metrics for @aws/nx-plugin
|
|
19
|
+
*/
|
|
20
|
+
class MetricsAspect implements IAspect {
|
|
21
|
+
visit(node: IConstruct): void {
|
|
22
|
+
if (node instanceof Stack) {
|
|
23
|
+
const id = '';
|
|
24
|
+
const version = '';
|
|
25
|
+
const tags: string[] = [];
|
|
26
|
+
node.templateOptions.description =
|
|
27
|
+
\`\${node.templateOptions.description ?? ''} (\${id}) (version:\${version}) (tags:\${tags.join(',')})\`.trim();
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
"
|
|
32
|
+
`;
|
|
33
|
+
|
|
34
|
+
exports[`shared-constructs utils > sharedConstructsGenerator > should generate shared constructs when they do not exist > packages/common/constructs/src/core/index.ts 1`] = `
|
|
35
|
+
"export * from './app.js';
|
|
36
|
+
export * from './runtime-config.js';
|
|
37
|
+
"
|
|
38
|
+
`;
|
|
39
|
+
|
|
40
|
+
exports[`shared-constructs utils > sharedConstructsGenerator > should generate shared constructs when they do not exist > packages/common/constructs/src/core/runtime-config.ts 1`] = `
|
|
41
|
+
"import type { IRuntimeConfig } from ':test-scope/common-types';
|
|
42
|
+
import { Stack } from 'aws-cdk-lib';
|
|
43
|
+
import { Construct } from 'constructs';
|
|
44
|
+
|
|
45
|
+
const RuntimeConfigKey = '__RuntimeConfig__';
|
|
46
|
+
|
|
47
|
+
export class RuntimeConfig extends Construct {
|
|
48
|
+
private readonly _runtimeConfig: Partial<IRuntimeConfig> = {};
|
|
49
|
+
|
|
50
|
+
static ensure(scope: Construct): RuntimeConfig {
|
|
51
|
+
const stack = Stack.of(scope);
|
|
52
|
+
return (
|
|
53
|
+
RuntimeConfig.of(scope) ?? new RuntimeConfig(stack, RuntimeConfigKey)
|
|
54
|
+
);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
static of(scope: Construct): RuntimeConfig | undefined {
|
|
58
|
+
const stack = Stack.of(scope);
|
|
59
|
+
return stack.node.tryFindChild(RuntimeConfigKey) as
|
|
60
|
+
| RuntimeConfig
|
|
61
|
+
| undefined;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
constructor(scope: Construct, id: string) {
|
|
65
|
+
super(scope, id);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
get config(): Partial<IRuntimeConfig> {
|
|
69
|
+
return this._runtimeConfig;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
"
|
|
73
|
+
`;
|
|
74
|
+
|
|
75
|
+
exports[`shared-constructs utils > sharedConstructsGenerator > should generate shared constructs when they do not exist > packages/common/constructs/src/index.ts 1`] = `
|
|
76
|
+
"export * from './app/index.js';
|
|
77
|
+
export * from './core/index.js';
|
|
78
|
+
"
|
|
79
|
+
`;
|
|
80
|
+
|
|
81
|
+
exports[`shared-constructs utils > sharedConstructsGenerator > should generate type definitions when they do not exist > packages/common/types/src/index.ts 1`] = `
|
|
82
|
+
"export * from './runtime-config.js';
|
|
83
|
+
"
|
|
84
|
+
`;
|
|
85
|
+
|
|
86
|
+
exports[`shared-constructs utils > sharedConstructsGenerator > should generate type definitions when they do not exist > packages/common/types/src/runtime-config.ts 1`] = `
|
|
87
|
+
"// eslint-disable-next-line @typescript-eslint/no-empty-object-type, @typescript-eslint/no-empty-interface
|
|
88
|
+
export interface IRuntimeConfig {}
|
|
89
|
+
"
|
|
90
|
+
`;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { App as _App, AppProps, Aspects, IAspect, Stack } from 'aws-cdk-lib';
|
|
2
|
+
import { IConstruct } from 'constructs';
|
|
3
|
+
|
|
4
|
+
export class App extends _App {
|
|
5
|
+
constructor(props?: AppProps) {
|
|
6
|
+
super(props);
|
|
7
|
+
|
|
8
|
+
Aspects.of(this).add(new MetricsAspect());
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Adds information to CloudFormation stack descriptions to provide usage metrics for @aws/nx-plugin
|
|
14
|
+
*/
|
|
15
|
+
class MetricsAspect implements IAspect {
|
|
16
|
+
visit(node: IConstruct): void {
|
|
17
|
+
if (node instanceof Stack) {
|
|
18
|
+
const id = '';
|
|
19
|
+
const version = '';
|
|
20
|
+
const tags: string[] = [];
|
|
21
|
+
node.templateOptions.description = `${node.templateOptions.description ?? ''} (${id}) (version:${version}) (tags:${tags.join(',')})`.trim();
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
package/src/utils/http-api.js
CHANGED
|
@@ -7,18 +7,18 @@ exports.addHttpApi = void 0;
|
|
|
7
7
|
*/
|
|
8
8
|
const devkit_1 = require("@nx/devkit");
|
|
9
9
|
const typescript_1 = require("typescript");
|
|
10
|
-
const
|
|
10
|
+
const shared_constructs_constants_1 = require("./shared-constructs-constants");
|
|
11
11
|
const ast_1 = require("./ast");
|
|
12
12
|
const addHttpApi = (tree, apiNameClassName) => {
|
|
13
|
-
const shouldGenerateCoreFastApiConstruct = !tree.exists((0, devkit_1.joinPathFragments)(
|
|
13
|
+
const shouldGenerateCoreFastApiConstruct = !tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'http-api.ts'));
|
|
14
14
|
if (shouldGenerateCoreFastApiConstruct) {
|
|
15
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'http-api',
|
|
15
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'http-api', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), {}, {
|
|
16
16
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
17
17
|
});
|
|
18
|
-
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(
|
|
18
|
+
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'index.ts'), './http-api.js');
|
|
19
19
|
}
|
|
20
20
|
// Update runtime-config.ts with ApiUrl type and httpApis property
|
|
21
|
-
const runtimeConfigPath = (0, devkit_1.joinPathFragments)(
|
|
21
|
+
const runtimeConfigPath = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.TYPE_DEFINITIONS_DIR, 'src', 'runtime-config.ts');
|
|
22
22
|
// Check if ApiUrl type exists
|
|
23
23
|
const existingApiUrl = (0, ast_1.query)(tree, runtimeConfigPath, 'TypeAliasDeclaration[name.text="ApiUrl"]');
|
|
24
24
|
// Check if httpApis property exists in IRuntimeConfig
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-api.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/http-api.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAKoB;AACpB,2CAKoB;AACpB
|
|
1
|
+
{"version":3,"file":"http-api.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/http-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
import { Tree } from '@nx/devkit';
|
|
6
|
+
import { NxGeneratorInfo } from './nx';
|
|
7
|
+
export declare const METRIC_ID = "uksb-4wk0bqpg5s";
|
|
8
|
+
export declare const METRICS_ASPECT_FILE_PATH: string;
|
|
9
|
+
export declare const metricsAspectVariableQuery: (variableName: string, valueQuery: string) => string;
|
|
10
|
+
/**
|
|
11
|
+
* Instruments metrics by updating the MetricsAspect in common/constructs/src/core/app.ts if the file exists
|
|
12
|
+
*/
|
|
13
|
+
export declare const addGeneratorMetricsIfApplicable: (tree: Tree, generatorInfo: NxGeneratorInfo[]) => Promise<void>;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addGeneratorMetricsIfApplicable = exports.metricsAspectVariableQuery = exports.METRICS_ASPECT_FILE_PATH = exports.METRIC_ID = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
/**
|
|
6
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
7
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
8
|
+
*/
|
|
9
|
+
const devkit_1 = require("@nx/devkit");
|
|
10
|
+
const typescript_1 = require("typescript");
|
|
11
|
+
const ast_1 = require("./ast");
|
|
12
|
+
const format_1 = require("./format");
|
|
13
|
+
const nx_1 = require("./nx");
|
|
14
|
+
const shared_constructs_constants_1 = require("./shared-constructs-constants");
|
|
15
|
+
// Used to identify @aws/nx-plugin in AWS metrics
|
|
16
|
+
exports.METRIC_ID = 'uksb-4wk0bqpg5s';
|
|
17
|
+
// File in which the MetricsAspect may exist
|
|
18
|
+
exports.METRICS_ASPECT_FILE_PATH = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'app.ts');
|
|
19
|
+
// Query to find a particular metrics aspect variable
|
|
20
|
+
const metricsAspectVariableQuery = (variableName, valueQuery) => `ClassDeclaration[name.name="MetricsAspect"] MethodDeclaration[name.name="visit"] VariableDeclaration:has(Identifier[name="${variableName}"]) ${valueQuery}`;
|
|
21
|
+
exports.metricsAspectVariableQuery = metricsAspectVariableQuery;
|
|
22
|
+
/**
|
|
23
|
+
* Instruments metrics by updating the MetricsAspect in common/constructs/src/core/app.ts if the file exists
|
|
24
|
+
*/
|
|
25
|
+
const addGeneratorMetricsIfApplicable = (tree, generatorInfo) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
26
|
+
if (tree.exists(exports.METRICS_ASPECT_FILE_PATH)) {
|
|
27
|
+
// Update the id
|
|
28
|
+
(0, ast_1.replaceIfExists)(tree, exports.METRICS_ASPECT_FILE_PATH, (0, exports.metricsAspectVariableQuery)('id', 'StringLiteral'), () => {
|
|
29
|
+
return typescript_1.factory.createStringLiteral(exports.METRIC_ID, true);
|
|
30
|
+
});
|
|
31
|
+
// Update the version
|
|
32
|
+
(0, ast_1.replaceIfExists)(tree, exports.METRICS_ASPECT_FILE_PATH, (0, exports.metricsAspectVariableQuery)('version', 'StringLiteral'), () => {
|
|
33
|
+
return typescript_1.factory.createStringLiteral((0, nx_1.getPackageVersion)(), true);
|
|
34
|
+
});
|
|
35
|
+
// Add each generator as a tag
|
|
36
|
+
(0, ast_1.replaceIfExists)(tree, exports.METRICS_ASPECT_FILE_PATH, (0, exports.metricsAspectVariableQuery)('tags', 'ArrayLiteralExpression'), (node) => {
|
|
37
|
+
const existingMetrics = new Set(node.elements.map((element) => element === null || element === void 0 ? void 0 : element.text));
|
|
38
|
+
return typescript_1.factory.createArrayLiteralExpression([
|
|
39
|
+
...node.elements,
|
|
40
|
+
...generatorInfo
|
|
41
|
+
.filter((info) => !existingMetrics.has(info.metric))
|
|
42
|
+
.map((info) => typescript_1.factory.createStringLiteral(info.metric, true)),
|
|
43
|
+
]);
|
|
44
|
+
});
|
|
45
|
+
yield (0, format_1.formatFilesInSubtree)(tree, exports.METRICS_ASPECT_FILE_PATH);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
exports.addGeneratorMetricsIfApplicable = addGeneratorMetricsIfApplicable;
|
|
49
|
+
//# sourceMappingURL=metrics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/metrics.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAqD;AACrD,2CAA4E;AAC5E,+BAAwC;AACxC,qCAAgD;AAChD,6BAA0D;AAC1D,+EAGuC;AAEvC,iDAAiD;AACpC,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAE3C,4CAA4C;AAC/B,QAAA,wBAAwB,GAAG,IAAA,0BAAiB,EACvD,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,MAAM,EACN,QAAQ,CACT,CAAC;AAEF,qDAAqD;AAC9C,MAAM,0BAA0B,GAAG,CACxC,YAAoB,EACpB,UAAkB,EAClB,EAAE,CACF,6HAA6H,YAAY,OAAO,UAAU,EAAE,CAAC;AAJlJ,QAAA,0BAA0B,8BAIwH;AAE/J;;GAEG;AACI,MAAM,+BAA+B,GAAG,CAC7C,IAAU,EACV,aAAgC,EAChC,EAAE;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,gCAAwB,CAAC,EAAE,CAAC;QAC1C,gBAAgB;QAChB,IAAA,qBAAe,EACb,IAAI,EACJ,gCAAwB,EACxB,IAAA,kCAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,EACjD,GAAkB,EAAE;YAClB,OAAO,oBAAO,CAAC,mBAAmB,CAAC,iBAAS,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC,CACF,CAAC;QACF,qBAAqB;QACrB,IAAA,qBAAe,EACb,IAAI,EACJ,gCAAwB,EACxB,IAAA,kCAA0B,EAAC,SAAS,EAAE,eAAe,CAAC,EACtD,GAAkB,EAAE;YAClB,OAAO,oBAAO,CAAC,mBAAmB,CAAC,IAAA,sBAAiB,GAAE,EAAE,IAAI,CAAC,CAAC;QAChE,CAAC,CACF,CAAC;QACF,8BAA8B;QAC9B,IAAA,qBAAe,EACb,IAAI,EACJ,gCAAwB,EACxB,IAAA,kCAA0B,EAAC,MAAM,EAAE,wBAAwB,CAAC,EAC5D,CAAC,IAA4B,EAA0B,EAAE;YACvD,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAE,OAAyB,aAAzB,OAAO,uBAAP,OAAO,CAAoB,IAAI,CAAC,CACjE,CAAC;YAEF,OAAO,oBAAO,CAAC,4BAA4B,CAAC;gBAC1C,GAAG,IAAI,CAAC,QAAQ;gBAChB,GAAG,aAAa;qBACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;qBACnD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aACjE,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QACF,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,gCAAwB,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC,CAAA,CAAC;AA3CW,QAAA,+BAA+B,mCA2C1C"}
|
package/src/utils/names.d.ts
CHANGED
|
@@ -3,3 +3,4 @@ export declare const toKebabCase: (str?: string) => string;
|
|
|
3
3
|
export declare const toSnakeCase: (str?: string) => string;
|
|
4
4
|
export declare const upperFirst: (str: string) => string;
|
|
5
5
|
export declare const pascalCase: (str: string) => string;
|
|
6
|
+
export declare const toDotNotation: (str: string) => string;
|
package/src/utils/names.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pascalCase = exports.upperFirst = exports.toSnakeCase = exports.toKebabCase = exports.toClassName = void 0;
|
|
3
|
+
exports.toDotNotation = exports.pascalCase = exports.upperFirst = exports.toSnakeCase = exports.toKebabCase = exports.toClassName = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
/**
|
|
6
6
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
@@ -32,4 +32,7 @@ const upperFirst = (str) => str.charAt(0).toUpperCase() + str.slice(1);
|
|
|
32
32
|
exports.upperFirst = upperFirst;
|
|
33
33
|
const pascalCase = (str) => (0, exports.upperFirst)((0, lodash_camelcase_1.default)(str));
|
|
34
34
|
exports.pascalCase = pascalCase;
|
|
35
|
+
// Convert a string to a dot notation string (eg. lambda_handler/my_handler.py -> lambda_handler.my_handler)
|
|
36
|
+
const toDotNotation = (str) => str === null || str === void 0 ? void 0 : str.replace(/^\/|\/$/g, '').replace(/\.[^/.]+$/g, '').split('/').filter(Boolean).join('.');
|
|
37
|
+
exports.toDotNotation = toDotNotation;
|
|
35
38
|
//# sourceMappingURL=names.js.map
|
package/src/utils/names.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/names.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,gFAAyC;AACzC,gFAAyC;AACzC,gFAAyC;AAElC,MAAM,WAAW,GAAG,CAAC,GAAY,EAAU,EAAE;IAClD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7D,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACnB,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO,GAAG,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB;AAEK,MAAM,WAAW,GAAG,CAAC,GAAY,EAAU,EAAE,CAClD,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,0BAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAD9B,QAAA,WAAW,eACmB;AAEpC,MAAM,WAAW,GAAG,CAAC,GAAY,EAAU,EAAE,CAClD,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,0BAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAD9B,QAAA,WAAW,eACmB;AAEpC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AADhC,QAAA,UAAU,cACsB;AAEtC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,IAAA,kBAAU,EAAC,IAAA,0BAAS,EAAC,GAAG,CAAC,CAAC,CAAC;AAAjE,QAAA,UAAU,cAAuD"}
|
|
1
|
+
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/names.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,gFAAyC;AACzC,gFAAyC;AACzC,gFAAyC;AAElC,MAAM,WAAW,GAAG,CAAC,GAAY,EAAU,EAAE;IAClD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7D,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACnB,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO,GAAG,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB;AAEK,MAAM,WAAW,GAAG,CAAC,GAAY,EAAU,EAAE,CAClD,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,0BAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAD9B,QAAA,WAAW,eACmB;AAEpC,MAAM,WAAW,GAAG,CAAC,GAAY,EAAU,EAAE,CAClD,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,0BAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAD9B,QAAA,WAAW,eACmB;AAEpC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AADhC,QAAA,UAAU,cACsB;AAEtC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,IAAA,kBAAU,EAAC,IAAA,0BAAS,EAAC,GAAG,CAAC,CAAC,CAAC;AAAjE,QAAA,UAAU,cAAuD;AAE9E,4GAA4G;AACrG,MAAM,aAAa,GAAG,CAAC,GAAW,EAAU,EAAE,CACnD,GAAG,aAAH,GAAG,uBAAH,GAAG,CACC,OAAO,CAAC,UAAU,EAAE,EAAE,EACvB,OAAO,CAAC,YAAY,EAAE,EAAE,EACxB,KAAK,CAAC,GAAG,EACT,MAAM,CAAC,OAAO,EACd,IAAI,CAAC,GAAG,CAAC,CAAC;AANF,QAAA,aAAa,iBAMX"}
|
package/src/utils/nx.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
export interface NxGeneratorInfo {
|
|
2
|
+
readonly id: string;
|
|
3
|
+
readonly metric: string;
|
|
4
|
+
readonly resolvedFactoryPath: string;
|
|
5
|
+
}
|
|
1
6
|
/**
|
|
2
|
-
*
|
|
3
|
-
* SPDX-License-Identifier: Apache-2.0
|
|
7
|
+
* Return generator information. Call this from a generator method with __filename
|
|
4
8
|
*/
|
|
5
|
-
|
|
6
|
-
export declare const
|
|
7
|
-
[targetName: string]: TargetConfiguration;
|
|
8
|
-
}) => {};
|
|
9
|
+
export declare const getGeneratorInfo: (generatorFileName: string) => NxGeneratorInfo;
|
|
10
|
+
export declare const getPackageVersion: () => string;
|
package/src/utils/nx.js
CHANGED
|
@@ -1,11 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
3
|
+
exports.getPackageVersion = exports.getGeneratorInfo = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
/**
|
|
6
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
7
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
8
|
+
*/
|
|
9
|
+
const generators_json_1 = tslib_1.__importDefault(require("../../generators.json"));
|
|
10
|
+
const package_json_1 = tslib_1.__importDefault(require("../../package.json"));
|
|
11
|
+
const path = tslib_1.__importStar(require("path"));
|
|
12
|
+
const GENERATORS = Object.entries(generators_json_1.default.generators).map(([id, { metric, factory }]) => ({
|
|
13
|
+
id,
|
|
14
|
+
metric,
|
|
15
|
+
resolvedFactoryPath: path.resolve(__dirname, '..', '..', factory),
|
|
16
|
+
}));
|
|
17
|
+
/**
|
|
18
|
+
* Return generator information. Call this from a generator method with __filename
|
|
19
|
+
*/
|
|
20
|
+
const getGeneratorInfo = (generatorFileName) => {
|
|
21
|
+
const { dir, name } = path.parse(path.resolve(generatorFileName));
|
|
22
|
+
const resolvedFactoryPath = path.join(dir, name);
|
|
23
|
+
return GENERATORS.find((generatorInfo) => generatorInfo.resolvedFactoryPath === resolvedFactoryPath);
|
|
24
|
+
};
|
|
25
|
+
exports.getGeneratorInfo = getGeneratorInfo;
|
|
26
|
+
const getPackageVersion = () => {
|
|
27
|
+
return package_json_1.default.version;
|
|
28
|
+
};
|
|
29
|
+
exports.getPackageVersion = getPackageVersion;
|
|
11
30
|
//# sourceMappingURL=nx.js.map
|
package/src/utils/nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nx.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nx.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,oFAAmD;AACnD,8EAA6C;AAC7C,mDAA6B;AAQ7B,MAAM,UAAU,GAAsB,MAAM,CAAC,OAAO,CAClD,yBAAc,CAAC,UAAU,CAC1B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACpC,EAAE;IACF,MAAM;IACN,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC;CAClE,CAAC,CAAC,CAAC;AAEJ;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAC9B,iBAAyB,EACR,EAAE;IACnB,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAClE,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjD,OAAO,UAAU,CAAC,IAAI,CACpB,CAAC,aAAa,EAAE,EAAE,CAChB,aAAa,CAAC,mBAAmB,KAAK,mBAAmB,CAC5D,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B;AAEK,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,OAAO,sBAAW,CAAC,OAAO,CAAC;AAC7B,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.sortObjectKeys = void 0;
|
|
8
|
+
const sortObjectKeys = (object) => Object.keys(object)
|
|
9
|
+
.sort()
|
|
10
|
+
.reduce((obj, key) => {
|
|
11
|
+
obj[key] = object[key];
|
|
12
|
+
return obj;
|
|
13
|
+
}, {});
|
|
14
|
+
exports.sortObjectKeys = sortObjectKeys;
|
|
15
|
+
//# sourceMappingURL=object.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/object.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEI,MAAM,cAAc,GAAG,CAAI,MAEjC,EAAwB,EAAE,CACzB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;KAChB,IAAI,EAAE;KACN,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACnB,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAAE,CAAC,CAAC;AARE,QAAA,cAAc,kBAQhB"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
export declare const PACKAGES_DIR = "packages";
|
|
6
|
+
export declare const TYPE_DEFINITIONS_NAME = "common-types";
|
|
7
|
+
export declare const SHARED_CONSTRUCTS_NAME = "common-constructs";
|
|
8
|
+
export declare const TYPE_DEFINITIONS_DIR = "common/types";
|
|
9
|
+
export declare const SHARED_CONSTRUCTS_DIR = "common/constructs";
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.SHARED_CONSTRUCTS_DIR = exports.TYPE_DEFINITIONS_DIR = exports.SHARED_CONSTRUCTS_NAME = exports.TYPE_DEFINITIONS_NAME = exports.PACKAGES_DIR = void 0;
|
|
8
|
+
exports.PACKAGES_DIR = 'packages';
|
|
9
|
+
exports.TYPE_DEFINITIONS_NAME = 'common-types';
|
|
10
|
+
exports.SHARED_CONSTRUCTS_NAME = 'common-constructs';
|
|
11
|
+
exports.TYPE_DEFINITIONS_DIR = 'common/types';
|
|
12
|
+
exports.SHARED_CONSTRUCTS_DIR = 'common/constructs';
|
|
13
|
+
//# sourceMappingURL=shared-constructs-constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared-constructs-constants.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs-constants.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,YAAY,GAAG,UAAU,CAAC;AAC1B,QAAA,qBAAqB,GAAG,cAAc,CAAC;AACvC,QAAA,sBAAsB,GAAG,mBAAmB,CAAC;AAC7C,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,qBAAqB,GAAG,mBAAmB,CAAC"}
|
|
@@ -3,9 +3,4 @@
|
|
|
3
3
|
* SPDX-License-Identifier: Apache-2.0
|
|
4
4
|
*/
|
|
5
5
|
import { Tree } from '@nx/devkit';
|
|
6
|
-
export declare const PACKAGES_DIR = "packages";
|
|
7
|
-
export declare const TYPE_DEFINITIONS_NAME = "common-types";
|
|
8
|
-
export declare const SHARED_CONSTRUCTS_NAME = "common-constructs";
|
|
9
|
-
export declare const TYPE_DEFINITIONS_DIR = "common/types";
|
|
10
|
-
export declare const SHARED_CONSTRUCTS_DIR = "common/constructs";
|
|
11
6
|
export declare function sharedConstructsGenerator(tree: Tree): Promise<void>;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SHARED_CONSTRUCTS_DIR = exports.TYPE_DEFINITIONS_DIR = exports.SHARED_CONSTRUCTS_NAME = exports.TYPE_DEFINITIONS_NAME = exports.PACKAGES_DIR = void 0;
|
|
4
3
|
exports.sharedConstructsGenerator = sharedConstructsGenerator;
|
|
5
4
|
const tslib_1 = require("tslib");
|
|
6
5
|
/**
|
|
@@ -12,52 +11,48 @@ const npm_scope_1 = require("./npm-scope");
|
|
|
12
11
|
const generator_1 = tslib_1.__importDefault(require("../ts/lib/generator"));
|
|
13
12
|
const versions_1 = require("./versions");
|
|
14
13
|
const format_1 = require("./format");
|
|
15
|
-
|
|
16
|
-
exports.TYPE_DEFINITIONS_NAME = 'common-types';
|
|
17
|
-
exports.SHARED_CONSTRUCTS_NAME = 'common-constructs';
|
|
18
|
-
exports.TYPE_DEFINITIONS_DIR = 'common/types';
|
|
19
|
-
exports.SHARED_CONSTRUCTS_DIR = 'common/constructs';
|
|
14
|
+
const shared_constructs_constants_1 = require("./shared-constructs-constants");
|
|
20
15
|
function sharedConstructsGenerator(tree) {
|
|
21
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
17
|
const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
|
|
23
18
|
updateGitignore(tree);
|
|
24
|
-
if (!tree.exists((0, devkit_1.joinPathFragments)(
|
|
19
|
+
if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.TYPE_DEFINITIONS_DIR, 'project.json'))) {
|
|
25
20
|
yield (0, generator_1.default)(tree, {
|
|
26
|
-
name:
|
|
27
|
-
directory:
|
|
28
|
-
subDirectory:
|
|
21
|
+
name: shared_constructs_constants_1.TYPE_DEFINITIONS_NAME,
|
|
22
|
+
directory: shared_constructs_constants_1.PACKAGES_DIR,
|
|
23
|
+
subDirectory: shared_constructs_constants_1.TYPE_DEFINITIONS_DIR,
|
|
29
24
|
});
|
|
30
|
-
tree.delete((0, devkit_1.joinPathFragments)(
|
|
31
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files',
|
|
25
|
+
tree.delete((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.TYPE_DEFINITIONS_DIR, 'src'));
|
|
26
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.TYPE_DEFINITIONS_DIR, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.TYPE_DEFINITIONS_DIR, 'src'), {
|
|
32
27
|
npmScopePrefix,
|
|
33
28
|
}, {
|
|
34
29
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
35
30
|
});
|
|
36
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), (0, devkit_1.joinPathFragments)(
|
|
37
|
-
fullyQualifiedName: `${npmScopePrefix}${
|
|
38
|
-
name:
|
|
31
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.TYPE_DEFINITIONS_DIR), {
|
|
32
|
+
fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.TYPE_DEFINITIONS_NAME}`,
|
|
33
|
+
name: shared_constructs_constants_1.TYPE_DEFINITIONS_NAME,
|
|
39
34
|
pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec,
|
|
40
35
|
}, {
|
|
41
36
|
overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
|
|
42
37
|
});
|
|
43
38
|
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
44
39
|
}
|
|
45
|
-
if (!tree.exists((0, devkit_1.joinPathFragments)(
|
|
40
|
+
if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'project.json'))) {
|
|
46
41
|
yield (0, generator_1.default)(tree, {
|
|
47
|
-
name:
|
|
48
|
-
directory:
|
|
49
|
-
subDirectory:
|
|
42
|
+
name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
|
|
43
|
+
directory: shared_constructs_constants_1.PACKAGES_DIR,
|
|
44
|
+
subDirectory: shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR,
|
|
50
45
|
});
|
|
51
|
-
tree.delete((0, devkit_1.joinPathFragments)(
|
|
52
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files',
|
|
46
|
+
tree.delete((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'));
|
|
47
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), {
|
|
53
48
|
npmScopePrefix,
|
|
54
49
|
scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix),
|
|
55
50
|
}, {
|
|
56
51
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
57
52
|
});
|
|
58
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), (0, devkit_1.joinPathFragments)(
|
|
59
|
-
fullyQualifiedName: `${npmScopePrefix}${
|
|
60
|
-
name:
|
|
53
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR), {
|
|
54
|
+
fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME}`,
|
|
55
|
+
name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
|
|
61
56
|
pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec,
|
|
62
57
|
}, {
|
|
63
58
|
overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
|