projen 0.49.0 → 0.49.1
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/.jsii +1059 -1056
- package/.prettierignore +1 -0
- package/.prettierrc.json +3 -0
- package/API.md +1 -1
- package/changelog.md +1 -11
- package/lib/_resolve.d.ts +1 -1
- package/lib/_resolve.js +5 -7
- package/lib/awscdk/auto-discover.d.ts +4 -4
- package/lib/awscdk/auto-discover.js +2 -2
- package/lib/awscdk/awscdk-app-java.d.ts +4 -4
- package/lib/awscdk/awscdk-app-java.js +22 -18
- package/lib/awscdk/awscdk-app-ts.d.ts +5 -5
- package/lib/awscdk/awscdk-app-ts.js +33 -32
- package/lib/awscdk/awscdk-construct.d.ts +3 -3
- package/lib/awscdk/awscdk-construct.js +10 -8
- package/lib/awscdk/awscdk-deps-java.d.ts +1 -1
- package/lib/awscdk/awscdk-deps-java.js +6 -6
- package/lib/awscdk/awscdk-deps-js.d.ts +1 -1
- package/lib/awscdk/awscdk-deps-js.js +7 -7
- package/lib/awscdk/awscdk-deps.d.ts +3 -3
- package/lib/awscdk/awscdk-deps.js +17 -14
- package/lib/awscdk/cdk-config.d.ts +3 -3
- package/lib/awscdk/cdk-config.js +5 -5
- package/lib/awscdk/cdk-tasks.d.ts +3 -3
- package/lib/awscdk/cdk-tasks.js +21 -20
- package/lib/awscdk/index.d.ts +11 -11
- package/lib/awscdk/index.js +1 -1
- package/lib/awscdk/integration-test.d.ts +4 -4
- package/lib/awscdk/integration-test.js +15 -13
- package/lib/awscdk/internal.js +16 -16
- package/lib/awscdk/lambda-function.d.ts +4 -4
- package/lib/awscdk/lambda-function.js +29 -29
- package/lib/build/build-workflow.d.ts +5 -5
- package/lib/build/build-workflow.js +36 -30
- package/lib/build/index.d.ts +1 -1
- package/lib/build/index.js +1 -1
- package/lib/builtin-example.task.js +3 -3
- package/lib/cdk/construct-lib.d.ts +1 -1
- package/lib/cdk/construct-lib.js +4 -4
- package/lib/cdk/consts.d.ts +2 -2
- package/lib/cdk/consts.js +5 -5
- package/lib/cdk/index.d.ts +3 -3
- package/lib/cdk/index.js +1 -1
- package/lib/cdk/jsii-docgen.d.ts +1 -1
- package/lib/cdk/jsii-docgen.js +7 -7
- package/lib/cdk/jsii-project.d.ts +3 -3
- package/lib/cdk/jsii-project.js +39 -39
- package/lib/cdk8s/cdk8s-app-ts.d.ts +1 -1
- package/lib/cdk8s/cdk8s-app-ts.js +28 -21
- package/lib/cdk8s/cdk8s-construct.d.ts +1 -1
- package/lib/cdk8s/cdk8s-construct.js +10 -6
- package/lib/cdk8s/index.d.ts +2 -2
- package/lib/cdk8s/index.js +1 -1
- package/lib/cdktf/cdktf-construct.d.ts +1 -1
- package/lib/cdktf/cdktf-construct.js +4 -4
- package/lib/cdktf/index.d.ts +1 -1
- package/lib/cdktf/index.js +1 -1
- package/lib/cleanup.js +20 -14
- package/lib/cli/cmds/new.js +71 -42
- package/lib/cli/index.js +27 -10
- package/lib/cli/macros.js +15 -11
- package/lib/cli/synth.d.ts +1 -1
- package/lib/cli/synth.js +15 -12
- package/lib/cli/tasks.d.ts +2 -2
- package/lib/cli/tasks.js +9 -6
- package/lib/cli/util.js +4 -4
- package/lib/clobber.d.ts +2 -2
- package/lib/clobber.js +14 -10
- package/lib/common.js +7 -9
- package/lib/component.d.ts +1 -1
- package/lib/component.js +2 -2
- package/lib/dependencies.d.ts +2 -2
- package/lib/dependencies.js +14 -12
- package/lib/dev-env.d.ts +1 -1
- package/lib/dev-env.js +2 -2
- package/lib/docker-compose.d.ts +2 -2
- package/lib/docker-compose.js +23 -19
- package/lib/file.d.ts +2 -2
- package/lib/file.js +7 -5
- package/lib/gitattributes.d.ts +2 -2
- package/lib/gitattributes.js +7 -8
- package/lib/github/auto-approve.d.ts +2 -2
- package/lib/github/auto-approve.js +25 -15
- package/lib/github/auto-merge.d.ts +2 -2
- package/lib/github/auto-merge.js +14 -14
- package/lib/github/constants.d.ts +1 -1
- package/lib/github/constants.js +4 -4
- package/lib/github/dependabot.d.ts +2 -2
- package/lib/github/dependabot.js +16 -14
- package/lib/github/github-project.d.ts +5 -5
- package/lib/github/github-project.js +14 -10
- package/lib/github/github.d.ts +7 -7
- package/lib/github/github.js +7 -5
- package/lib/github/index.d.ts +13 -13
- package/lib/github/index.js +1 -1
- package/lib/github/mergify.d.ts +2 -2
- package/lib/github/mergify.js +3 -3
- package/lib/github/pr-template.d.ts +2 -2
- package/lib/github/pr-template.js +5 -5
- package/lib/github/pull-request-lint.d.ts +2 -2
- package/lib/github/pull-request-lint.js +17 -14
- package/lib/github/stale-util.d.ts +1 -1
- package/lib/github/stale-util.js +2 -3
- package/lib/github/stale.d.ts +2 -2
- package/lib/github/stale.js +28 -20
- package/lib/github/task-workflow.d.ts +4 -4
- package/lib/github/task-workflow.js +12 -10
- package/lib/github/workflow-actions.d.ts +2 -2
- package/lib/github/workflow-actions.js +22 -20
- package/lib/github/workflows-model.d.ts +20 -20
- package/lib/github/workflows-model.js +1 -1
- package/lib/github/workflows.d.ts +4 -4
- package/lib/github/workflows.js +42 -27
- package/lib/gitpod.d.ts +4 -4
- package/lib/gitpod.js +12 -9
- package/lib/ignore-file.d.ts +2 -2
- package/lib/ignore-file.js +10 -13
- package/lib/index.d.ts +46 -46
- package/lib/index.js +1 -1
- package/lib/ini.d.ts +3 -3
- package/lib/ini.js +4 -4
- package/lib/inventory.d.ts +1 -1
- package/lib/inventory.js +34 -30
- package/lib/java/index.d.ts +7 -7
- package/lib/java/index.js +1 -1
- package/lib/java/java-project.d.ts +6 -6
- package/lib/java/java-project.js +11 -13
- package/lib/java/junit.d.ts +3 -3
- package/lib/java/junit.js +17 -17
- package/lib/java/maven-compile.d.ts +3 -3
- package/lib/java/maven-compile.js +7 -7
- package/lib/java/maven-packaging.d.ts +3 -3
- package/lib/java/maven-packaging.js +12 -16
- package/lib/java/maven-sample.d.ts +2 -2
- package/lib/java/maven-sample.js +12 -12
- package/lib/java/pom.d.ts +2 -2
- package/lib/java/pom.js +16 -14
- package/lib/java/projenrc.d.ts +3 -3
- package/lib/java/projenrc.js +35 -25
- package/lib/javascript/bundler.d.ts +3 -3
- package/lib/javascript/bundler.js +14 -12
- package/lib/javascript/eslint.d.ts +4 -3
- package/lib/javascript/eslint.js +102 -86
- package/lib/javascript/index.d.ts +10 -10
- package/lib/javascript/index.js +1 -1
- package/lib/javascript/jest.d.ts +4 -4
- package/lib/javascript/jest.js +48 -37
- package/lib/javascript/node-package.d.ts +2 -2
- package/lib/javascript/node-package.js +87 -77
- package/lib/javascript/node-project.d.ts +11 -11
- package/lib/javascript/node-project.js +78 -52
- package/lib/javascript/npm-config.d.ts +2 -2
- package/lib/javascript/npm-config.js +4 -4
- package/lib/javascript/prettier.d.ts +4 -4
- package/lib/javascript/prettier.js +5 -5
- package/lib/javascript/projenrc.d.ts +2 -2
- package/lib/javascript/projenrc.js +8 -8
- package/lib/javascript/render-options.d.ts +2 -2
- package/lib/javascript/render-options.js +23 -18
- package/lib/javascript/typescript-config.d.ts +2 -2
- package/lib/javascript/typescript-config.js +5 -5
- package/lib/javascript/upgrade-dependencies.d.ts +4 -4
- package/lib/javascript/upgrade-dependencies.js +67 -53
- package/lib/javascript/util.js +2 -2
- package/lib/json.d.ts +3 -3
- package/lib/json.js +4 -4
- package/lib/license.d.ts +2 -2
- package/lib/license.js +7 -7
- package/lib/logger.d.ts +2 -2
- package/lib/logger.js +14 -9
- package/lib/logging.js +2 -2
- package/lib/makefile.d.ts +2 -2
- package/lib/makefile.js +12 -15
- package/lib/object-file.d.ts +2 -2
- package/lib/object-file.js +9 -7
- package/lib/option-hints.js +1 -1
- package/lib/project-build.d.ts +3 -3
- package/lib/project-build.js +14 -14
- package/lib/project.d.ts +14 -14
- package/lib/project.js +41 -23
- package/lib/projects.d.ts +1 -1
- package/lib/projects.js +10 -11
- package/lib/projenrc-json.d.ts +2 -2
- package/lib/projenrc-json.js +5 -5
- package/lib/python/index.d.ts +13 -13
- package/lib/python/index.js +1 -1
- package/lib/python/pip.d.ts +4 -4
- package/lib/python/pip.js +16 -12
- package/lib/python/poetry.d.ts +7 -7
- package/lib/python/poetry.js +41 -33
- package/lib/python/projenrc.d.ts +2 -2
- package/lib/python/projenrc.js +24 -21
- package/lib/python/pytest.d.ts +2 -2
- package/lib/python/pytest.js +19 -19
- package/lib/python/python-deps.d.ts +2 -2
- package/lib/python/python-deps.js +1 -1
- package/lib/python/python-packaging.d.ts +2 -2
- package/lib/python/python-packaging.js +1 -1
- package/lib/python/python-project.d.ts +7 -7
- package/lib/python/python-project.js +14 -13
- package/lib/python/python-sample.d.ts +2 -2
- package/lib/python/python-sample.js +17 -17
- package/lib/python/requirements-file.d.ts +3 -3
- package/lib/python/requirements-file.js +7 -8
- package/lib/python/setuppy.d.ts +2 -2
- package/lib/python/setuppy.js +23 -23
- package/lib/python/setuptools.d.ts +4 -4
- package/lib/python/setuptools.js +11 -11
- package/lib/python/venv.d.ts +3 -3
- package/lib/python/venv.js +6 -6
- package/lib/readme.d.ts +2 -2
- package/lib/readme.js +5 -3
- package/lib/release/bump-version.d.ts +1 -1
- package/lib/release/bump-version.js +37 -26
- package/lib/release/bump-version.task.js +7 -7
- package/lib/release/index.d.ts +3 -3
- package/lib/release/index.js +1 -1
- package/lib/release/publisher.d.ts +4 -4
- package/lib/release/publisher.js +93 -78
- package/lib/release/release-trigger.js +3 -3
- package/lib/release/release.d.ts +6 -6
- package/lib/release/release.js +37 -23
- package/lib/release/reset-version.task.js +4 -4
- package/lib/release/tag-version.js +1 -1
- package/lib/release/tag-version.task.js +3 -3
- package/lib/release/update-changelog.js +6 -4
- package/lib/release/update-changelog.task.js +4 -4
- package/lib/run-projenrc-json.task.js +5 -5
- package/lib/sample-file.d.ts +2 -2
- package/lib/sample-file.js +8 -8
- package/lib/semver.js +17 -7
- package/lib/source-code.d.ts +2 -2
- package/lib/source-code.js +5 -5
- package/lib/task-model.js +1 -1
- package/lib/task-runtime.d.ts +1 -1
- package/lib/task-runtime.js +27 -27
- package/lib/task.d.ts +1 -1
- package/lib/task.js +2 -2
- package/lib/tasks.d.ts +3 -3
- package/lib/tasks.js +5 -5
- package/lib/testing.d.ts +1 -1
- package/lib/testing.js +2 -2
- package/lib/textfile.d.ts +2 -2
- package/lib/textfile.js +3 -3
- package/lib/toml.d.ts +3 -3
- package/lib/toml.js +4 -4
- package/lib/typescript/index.d.ts +3 -3
- package/lib/typescript/index.js +1 -1
- package/lib/typescript/projenrc.d.ts +2 -2
- package/lib/typescript/projenrc.js +10 -10
- package/lib/typescript/typescript-typedoc.d.ts +1 -1
- package/lib/typescript/typescript-typedoc.js +4 -4
- package/lib/typescript/typescript.d.ts +3 -3
- package/lib/typescript/typescript.js +59 -62
- package/lib/util/semver.js +33 -33
- package/lib/util/synth.d.ts +1 -1
- package/lib/util/synth.js +15 -12
- package/lib/util.js +39 -32
- package/lib/version.d.ts +3 -3
- package/lib/version.js +12 -12
- package/lib/vscode/devcontainer.d.ts +4 -4
- package/lib/vscode/devcontainer.js +13 -8
- package/lib/vscode/index.d.ts +3 -3
- package/lib/vscode/index.js +1 -1
- package/lib/vscode/launch-config.d.ts +2 -2
- package/lib/vscode/launch-config.js +4 -4
- package/lib/vscode/vscode.d.ts +3 -3
- package/lib/vscode/vscode.js +2 -2
- package/lib/web/index.d.ts +4 -4
- package/lib/web/index.js +1 -1
- package/lib/web/next.d.ts +3 -3
- package/lib/web/next.js +241 -237
- package/lib/web/postcss.d.ts +3 -3
- package/lib/web/postcss.js +9 -6
- package/lib/web/react.d.ts +4 -4
- package/lib/web/react.js +172 -177
- package/lib/web/tailwind.d.ts +2 -2
- package/lib/web/tailwind.js +3 -3
- package/lib/xmlfile.d.ts +3 -3
- package/lib/xmlfile.js +5 -5
- package/lib/yaml.d.ts +3 -3
- package/lib/yaml.js +4 -4
- package/package.json +4 -1
- package/releasetag.txt +1 -1
- package/version.txt +1 -1
|
@@ -21,13 +21,13 @@ class ConstructLibraryCdktf extends cdk_1.ConstructLibrary {
|
|
|
21
21
|
constructor(options) {
|
|
22
22
|
super(options);
|
|
23
23
|
if (!options.cdktfVersion) {
|
|
24
|
-
throw new Error(
|
|
24
|
+
throw new Error("Required field cdktfVersion is not specified.");
|
|
25
25
|
}
|
|
26
26
|
const ver = options.cdktfVersion;
|
|
27
|
-
this.addPeerDeps(
|
|
27
|
+
this.addPeerDeps("constructs@^10", `cdktf@^${ver}`);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
exports.ConstructLibraryCdktf = ConstructLibraryCdktf;
|
|
31
31
|
_a = JSII_RTTI_SYMBOL_1;
|
|
32
|
-
ConstructLibraryCdktf[_a] = { fqn: "projen.cdktf.ConstructLibraryCdktf", version: "0.49.
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
ConstructLibraryCdktf[_a] = { fqn: "projen.cdktf.ConstructLibraryCdktf", version: "0.49.1" };
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrdGYtY29uc3RydWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Nka3RmL2Nka3RmLWNvbnN0cnVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGdDQUFtRTs7Ozs7Ozs7Ozs7QUFRbkUsTUFBYSxxQkFBc0IsU0FBUSxzQkFBZ0I7Ozs7SUFDekQsWUFBWSxPQUFxQztRQUMvQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFZixJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRTtZQUN6QixNQUFNLElBQUksS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7U0FDbEU7UUFFRCxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDO1FBRWpDLElBQUksQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQ3RELENBQUM7O0FBWEgsc0RBWUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb25zdHJ1Y3RMaWJyYXJ5LCBDb25zdHJ1Y3RMaWJyYXJ5T3B0aW9ucyB9IGZyb20gXCIuLi9jZGtcIjtcblxuZXhwb3J0IGludGVyZmFjZSBDb25zdHJ1Y3RMaWJyYXJ5Q2RrdGZPcHRpb25zIGV4dGVuZHMgQ29uc3RydWN0TGlicmFyeU9wdGlvbnMge1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IGNka3RmVmVyc2lvbjogc3RyaW5nO1xufVxuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG5leHBvcnQgY2xhc3MgQ29uc3RydWN0TGlicmFyeUNka3RmIGV4dGVuZHMgQ29uc3RydWN0TGlicmFyeSB7XG4gIGNvbnN0cnVjdG9yKG9wdGlvbnM6IENvbnN0cnVjdExpYnJhcnlDZGt0Zk9wdGlvbnMpIHtcbiAgICBzdXBlcihvcHRpb25zKTtcblxuICAgIGlmICghb3B0aW9ucy5jZGt0ZlZlcnNpb24pIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcIlJlcXVpcmVkIGZpZWxkIGNka3RmVmVyc2lvbiBpcyBub3Qgc3BlY2lmaWVkLlwiKTtcbiAgICB9XG5cbiAgICBjb25zdCB2ZXIgPSBvcHRpb25zLmNka3RmVmVyc2lvbjtcblxuICAgIHRoaXMuYWRkUGVlckRlcHMoXCJjb25zdHJ1Y3RzQF4xMFwiLCBgY2RrdGZAXiR7dmVyfWApO1xuICB9XG59XG4iXX0=
|
package/lib/cdktf/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from
|
|
1
|
+
export * from "./cdktf-construct";
|
package/lib/cdktf/index.js
CHANGED
|
@@ -11,4 +11,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("./cdktf-construct"), exports);
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2RrdGYvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsb0RBQWtDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSBcIi4vY2RrdGYtY29uc3RydWN0XCI7XG4iXX0=
|
package/lib/cleanup.js
CHANGED
|
@@ -24,8 +24,13 @@ function findGeneratedFiles(dir, exclude) {
|
|
|
24
24
|
if (files.length > 0) {
|
|
25
25
|
return files;
|
|
26
26
|
}
|
|
27
|
-
const ignore = [
|
|
28
|
-
|
|
27
|
+
const ignore = [
|
|
28
|
+
...readGitIgnore(dir),
|
|
29
|
+
"node_modules/**",
|
|
30
|
+
...exclude,
|
|
31
|
+
".git/**",
|
|
32
|
+
];
|
|
33
|
+
files = glob.sync("**", {
|
|
29
34
|
ignore,
|
|
30
35
|
cwd: dir,
|
|
31
36
|
dot: true,
|
|
@@ -34,7 +39,7 @@ function findGeneratedFiles(dir, exclude) {
|
|
|
34
39
|
});
|
|
35
40
|
const generated = new Array();
|
|
36
41
|
for (const file of files) {
|
|
37
|
-
const contents = fs.readFileSync(file,
|
|
42
|
+
const contents = fs.readFileSync(file, "utf-8");
|
|
38
43
|
if (contents.includes(common_1.PROJEN_MARKER)) {
|
|
39
44
|
generated.push(file);
|
|
40
45
|
}
|
|
@@ -45,7 +50,7 @@ function getFilesFromManifest(dir) {
|
|
|
45
50
|
try {
|
|
46
51
|
const fileManifestPath = path.resolve(dir, exports.FILE_MANIFEST);
|
|
47
52
|
if (fs_extra_1.existsSync(fileManifestPath)) {
|
|
48
|
-
const fileManifest = JSON.parse(fs_extra_1.readFileSync(fileManifestPath,
|
|
53
|
+
const fileManifest = JSON.parse(fs_extra_1.readFileSync(fileManifestPath, "utf-8"));
|
|
49
54
|
if (fileManifest.files) {
|
|
50
55
|
return fileManifest.files.map((f) => path.resolve(dir, f));
|
|
51
56
|
}
|
|
@@ -57,17 +62,18 @@ function getFilesFromManifest(dir) {
|
|
|
57
62
|
return [];
|
|
58
63
|
}
|
|
59
64
|
function readGitIgnore(dir) {
|
|
60
|
-
const filepath = path.join(dir,
|
|
65
|
+
const filepath = path.join(dir, ".gitignore");
|
|
61
66
|
if (!fs.pathExistsSync(filepath)) {
|
|
62
67
|
return [];
|
|
63
68
|
}
|
|
64
|
-
return fs
|
|
65
|
-
.
|
|
66
|
-
.
|
|
67
|
-
.filter(x =>
|
|
68
|
-
.
|
|
69
|
-
.map(x =>
|
|
70
|
-
.
|
|
71
|
-
.
|
|
69
|
+
return fs
|
|
70
|
+
.readFileSync(filepath, "utf-8")
|
|
71
|
+
.split("\n")
|
|
72
|
+
.filter((x) => (x === null || x === void 0 ? void 0 : x.trim()) !== "")
|
|
73
|
+
.filter((x) => !x.startsWith("#") && !x.startsWith("!"))
|
|
74
|
+
.map((x) => x.replace(/^\//, "")) // remove "/" prefix
|
|
75
|
+
.map((x) => `${x}\n${x}/**`)
|
|
76
|
+
.join("\n")
|
|
77
|
+
.split("\n");
|
|
72
78
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYW51cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jbGVhbnVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZCQUE2QjtBQUM3QiwrQkFBK0I7QUFDL0IsdUNBQW9EO0FBQ3BELDZCQUE2QjtBQUM3QixxQ0FBcUQ7QUFDckQscUNBQXFDO0FBRXhCLFFBQUEsYUFBYSxHQUFHLEdBQUcsbUJBQVUsYUFBYSxDQUFDO0FBRXhELFNBQWdCLE9BQU8sQ0FBQyxHQUFXLEVBQUUsT0FBaUI7SUFDcEQsSUFBSTtRQUNGLEtBQUssTUFBTSxDQUFDLElBQUksa0JBQWtCLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxFQUFFO1lBQ2hELEVBQUUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDbEI7S0FDRjtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1YsT0FBTyxDQUFDLElBQUksQ0FBQyxnREFBZ0QsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7S0FDekU7QUFDSCxDQUFDO0FBUkQsMEJBUUM7QUFFRCxTQUFTLGtCQUFrQixDQUFDLEdBQVcsRUFBRSxPQUFpQjtJQUN4RCxJQUFJLEtBQUssR0FBRyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN0QyxJQUFJLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1FBQ3BCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLE1BQU0sR0FBRztRQUNiLEdBQUcsYUFBYSxDQUFDLEdBQUcsQ0FBQztRQUNyQixpQkFBaUI7UUFDakIsR0FBRyxPQUFPO1FBQ1YsU0FBUztLQUNWLENBQUM7SUFFRixLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7UUFDdEIsTUFBTTtRQUNOLEdBQUcsRUFBRSxHQUFHO1FBQ1IsR0FBRyxFQUFFLElBQUk7UUFDVCxLQUFLLEVBQUUsSUFBSTtRQUNYLFFBQVEsRUFBRSxJQUFJO0tBQ2YsQ0FBQyxDQUFDO0lBRUgsTUFBTSxTQUFTLEdBQUcsSUFBSSxLQUFLLEVBQVUsQ0FBQztJQUV0QyxLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRTtRQUN4QixNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztRQUVoRCxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsc0JBQWEsQ0FBQyxFQUFFO1lBQ3BDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdEI7S0FDRjtJQUVELE9BQU8sU0FBUyxDQUFDO0FBQ25CLENBQUM7QUFFRCxTQUFTLG9CQUFvQixDQUFDLEdBQVc7SUFDdkMsSUFBSTtRQUNGLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUscUJBQWEsQ0FBQyxDQUFDO1FBQzFELElBQUkscUJBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1lBQ2hDLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsdUJBQVksQ0FBQyxnQkFBZ0IsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ3pFLElBQUksWUFBWSxDQUFDLEtBQUssRUFBRTtnQkFDdEIsT0FBTyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQVMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQzthQUNwRTtTQUNGO0tBQ0Y7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNWLE9BQU8sQ0FBQyxJQUFJLENBQ1YsNkRBQTZELENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FDdkUsQ0FBQztLQUNIO0lBRUQsT0FBTyxFQUFFLENBQUM7QUFDWixDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsR0FBVztJQUNoQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUM5QyxJQUFJLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsRUFBRTtRQUNoQyxPQUFPLEVBQUUsQ0FBQztLQUNYO0lBRUQsT0FBTyxFQUFFO1NBQ04sWUFBWSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUM7U0FDL0IsS0FBSyxDQUFDLElBQUksQ0FBQztTQUNYLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQSxDQUFDLGFBQUQsQ0FBQyx1QkFBRCxDQUFDLENBQUUsSUFBSSxRQUFPLEVBQUUsQ0FBQztTQUMvQixNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDdkQsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLG9CQUFvQjtTQUNyRCxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDO1NBQzNCLElBQUksQ0FBQyxJQUFJLENBQUM7U0FDVixLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDakIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHBhdGggZnJvbSBcInBhdGhcIjtcbmltcG9ydCAqIGFzIGZzIGZyb20gXCJmcy1leHRyYVwiO1xuaW1wb3J0IHsgZXhpc3RzU3luYywgcmVhZEZpbGVTeW5jIH0gZnJvbSBcImZzLWV4dHJhXCI7XG5pbXBvcnQgKiBhcyBnbG9iIGZyb20gXCJnbG9iXCI7XG5pbXBvcnQgeyBQUk9KRU5fRElSLCBQUk9KRU5fTUFSS0VSIH0gZnJvbSBcIi4vY29tbW9uXCI7XG5pbXBvcnQgKiBhcyBsb2dnaW5nIGZyb20gXCIuL2xvZ2dpbmdcIjtcblxuZXhwb3J0IGNvbnN0IEZJTEVfTUFOSUZFU1QgPSBgJHtQUk9KRU5fRElSfS9maWxlcy5qc29uYDtcblxuZXhwb3J0IGZ1bmN0aW9uIGNsZWFudXAoZGlyOiBzdHJpbmcsIGV4Y2x1ZGU6IHN0cmluZ1tdKSB7XG4gIHRyeSB7XG4gICAgZm9yIChjb25zdCBmIG9mIGZpbmRHZW5lcmF0ZWRGaWxlcyhkaXIsIGV4Y2x1ZGUpKSB7XG4gICAgICBmcy5yZW1vdmVTeW5jKGYpO1xuICAgIH1cbiAgfSBjYXRjaCAoZSkge1xuICAgIGxvZ2dpbmcud2Fybihgd2FybmluZzogZmFpbGVkIHRvIGNsZWFuIHVwIGdlbmVyYXRlZCBmaWxlczogJHtlLnN0YWNrfWApO1xuICB9XG59XG5cbmZ1bmN0aW9uIGZpbmRHZW5lcmF0ZWRGaWxlcyhkaXI6IHN0cmluZywgZXhjbHVkZTogc3RyaW5nW10pIHtcbiAgbGV0IGZpbGVzID0gZ2V0RmlsZXNGcm9tTWFuaWZlc3QoZGlyKTtcbiAgaWYgKGZpbGVzLmxlbmd0aCA+IDApIHtcbiAgICByZXR1cm4gZmlsZXM7XG4gIH1cblxuICBjb25zdCBpZ25vcmUgPSBbXG4gICAgLi4ucmVhZEdpdElnbm9yZShkaXIpLFxuICAgIFwibm9kZV9tb2R1bGVzLyoqXCIsXG4gICAgLi4uZXhjbHVkZSxcbiAgICBcIi5naXQvKipcIixcbiAgXTtcblxuICBmaWxlcyA9IGdsb2Iuc3luYyhcIioqXCIsIHtcbiAgICBpZ25vcmUsXG4gICAgY3dkOiBkaXIsXG4gICAgZG90OiB0cnVlLFxuICAgIG5vZGlyOiB0cnVlLFxuICAgIGFic29sdXRlOiB0cnVlLFxuICB9KTtcblxuICBjb25zdCBnZW5lcmF0ZWQgPSBuZXcgQXJyYXk8c3RyaW5nPigpO1xuXG4gIGZvciAoY29uc3QgZmlsZSBvZiBmaWxlcykge1xuICAgIGNvbnN0IGNvbnRlbnRzID0gZnMucmVhZEZpbGVTeW5jKGZpbGUsIFwidXRmLThcIik7XG5cbiAgICBpZiAoY29udGVudHMuaW5jbHVkZXMoUFJPSkVOX01BUktFUikpIHtcbiAgICAgIGdlbmVyYXRlZC5wdXNoKGZpbGUpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBnZW5lcmF0ZWQ7XG59XG5cbmZ1bmN0aW9uIGdldEZpbGVzRnJvbU1hbmlmZXN0KGRpcjogc3RyaW5nKTogc3RyaW5nW10ge1xuICB0cnkge1xuICAgIGNvbnN0IGZpbGVNYW5pZmVzdFBhdGggPSBwYXRoLnJlc29sdmUoZGlyLCBGSUxFX01BTklGRVNUKTtcbiAgICBpZiAoZXhpc3RzU3luYyhmaWxlTWFuaWZlc3RQYXRoKSkge1xuICAgICAgY29uc3QgZmlsZU1hbmlmZXN0ID0gSlNPTi5wYXJzZShyZWFkRmlsZVN5bmMoZmlsZU1hbmlmZXN0UGF0aCwgXCJ1dGYtOFwiKSk7XG4gICAgICBpZiAoZmlsZU1hbmlmZXN0LmZpbGVzKSB7XG4gICAgICAgIHJldHVybiBmaWxlTWFuaWZlc3QuZmlsZXMubWFwKChmOiBzdHJpbmcpID0+IHBhdGgucmVzb2x2ZShkaXIsIGYpKTtcbiAgICAgIH1cbiAgICB9XG4gIH0gY2F0Y2ggKGUpIHtcbiAgICBsb2dnaW5nLndhcm4oXG4gICAgICBgd2FybmluZzogdW5hYmxlIHRvIGdldCBmaWxlcyB0byBjbGVhbiBmcm9tIGZpbGUgbWFuaWZlc3Q6ICR7ZS5zdGFja31gXG4gICAgKTtcbiAgfVxuXG4gIHJldHVybiBbXTtcbn1cblxuZnVuY3Rpb24gcmVhZEdpdElnbm9yZShkaXI6IHN0cmluZykge1xuICBjb25zdCBmaWxlcGF0aCA9IHBhdGguam9pbihkaXIsIFwiLmdpdGlnbm9yZVwiKTtcbiAgaWYgKCFmcy5wYXRoRXhpc3RzU3luYyhmaWxlcGF0aCkpIHtcbiAgICByZXR1cm4gW107XG4gIH1cblxuICByZXR1cm4gZnNcbiAgICAucmVhZEZpbGVTeW5jKGZpbGVwYXRoLCBcInV0Zi04XCIpXG4gICAgLnNwbGl0KFwiXFxuXCIpXG4gICAgLmZpbHRlcigoeCkgPT4geD8udHJpbSgpICE9PSBcIlwiKVxuICAgIC5maWx0ZXIoKHgpID0+ICF4LnN0YXJ0c1dpdGgoXCIjXCIpICYmICF4LnN0YXJ0c1dpdGgoXCIhXCIpKVxuICAgIC5tYXAoKHgpID0+IHgucmVwbGFjZSgvXlxcLy8sIFwiXCIpKSAvLyByZW1vdmUgXCIvXCIgcHJlZml4XG4gICAgLm1hcCgoeCkgPT4gYCR7eH1cXG4ke3h9LyoqYClcbiAgICAuam9pbihcIlxcblwiKVxuICAgIC5zcGxpdChcIlxcblwiKTtcbn1cbiJdfQ==
|
package/lib/cli/cmds/new.js
CHANGED
|
@@ -11,34 +11,59 @@ const macros_1 = require("../macros");
|
|
|
11
11
|
const util_2 = require("../util");
|
|
12
12
|
class Command {
|
|
13
13
|
constructor() {
|
|
14
|
-
this.command =
|
|
15
|
-
this.describe =
|
|
14
|
+
this.command = "new [PROJECT-TYPE-NAME] [OPTIONS]";
|
|
15
|
+
this.describe = "Creates a new projen project";
|
|
16
16
|
}
|
|
17
17
|
builder(args) {
|
|
18
18
|
var _a;
|
|
19
|
-
args.positional(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
args.option(
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
args.positional("PROJECT-TYPE-NAME", {
|
|
20
|
+
describe: "optional only when --from is used and there is a single project type in the external module",
|
|
21
|
+
type: "string",
|
|
22
|
+
});
|
|
23
|
+
args.option("synth", {
|
|
24
|
+
type: "boolean",
|
|
25
|
+
default: true,
|
|
26
|
+
desc: "Synthesize after creating .projenrc.js",
|
|
27
|
+
});
|
|
28
|
+
args.option("comments", {
|
|
29
|
+
type: "boolean",
|
|
30
|
+
default: true,
|
|
31
|
+
desc: "Include commented out options in .projenrc.js (use --no-comments to disable)",
|
|
32
|
+
});
|
|
33
|
+
args.option("from", {
|
|
34
|
+
type: "string",
|
|
35
|
+
alias: "f",
|
|
36
|
+
desc: 'External jsii npm module to create project from. Supports any package spec supported by npm (such as "my-pack@^2.0")',
|
|
37
|
+
});
|
|
38
|
+
args.option("git", {
|
|
39
|
+
type: "boolean",
|
|
40
|
+
default: true,
|
|
41
|
+
desc: "Run `git init` and create an initial commit (use --no-git to disable)",
|
|
42
|
+
});
|
|
43
|
+
args.example("projen new awscdk-app-ts", 'Creates a new project of built-in type "awscdk-app-ts"');
|
|
44
|
+
args.example("projen new --from projen-vue@^2", 'Creates a new project from an external module "projen-vue" with the specified version');
|
|
26
45
|
for (const type of inventory.discover()) {
|
|
27
|
-
args.command(type.pjid, (_a = type.docs) !== null && _a !== void 0 ? _a :
|
|
28
|
-
builder: cargs => {
|
|
46
|
+
args.command(type.pjid, (_a = type.docs) !== null && _a !== void 0 ? _a : "", {
|
|
47
|
+
builder: (cargs) => {
|
|
29
48
|
var _a, _b, _c;
|
|
30
49
|
cargs.showHelpOnFail(false);
|
|
31
50
|
for (const option of (_a = type.options) !== null && _a !== void 0 ? _a : []) {
|
|
32
|
-
if (option.simpleType !==
|
|
51
|
+
if (option.simpleType !== "string" &&
|
|
52
|
+
option.simpleType !== "number" &&
|
|
53
|
+
option.simpleType !== "boolean" &&
|
|
54
|
+
option.kind !== "enum") {
|
|
33
55
|
continue; // we only support primitive and enum fields as command line options
|
|
34
56
|
}
|
|
35
|
-
let desc = [(_c = (_b = option.docs) === null || _b === void 0 ? void 0 : _b.replace(/\ *\.$/,
|
|
57
|
+
let desc = [(_c = (_b = option.docs) === null || _b === void 0 ? void 0 : _b.replace(/\ *\.$/, "")) !== null && _c !== void 0 ? _c : ""];
|
|
36
58
|
const required = !option.optional;
|
|
37
59
|
let defaultValue;
|
|
38
|
-
if (option.default && option.default !==
|
|
60
|
+
if (option.default && option.default !== "undefined") {
|
|
39
61
|
if (!required) {
|
|
40
62
|
// if the field is not required, just describe the default but don't actually assign a value
|
|
41
|
-
desc.push(`[default: ${option.default
|
|
63
|
+
desc.push(`[default: ${option.default
|
|
64
|
+
.replace(/^\ *-/, "")
|
|
65
|
+
.replace(/\.$/, "")
|
|
66
|
+
.trim()}]`);
|
|
42
67
|
}
|
|
43
68
|
else {
|
|
44
69
|
// if the field is required and we have a @default, then assign
|
|
@@ -46,18 +71,18 @@ class Command {
|
|
|
46
71
|
defaultValue = renderDefault(process.cwd(), option.default);
|
|
47
72
|
}
|
|
48
73
|
}
|
|
49
|
-
const argType = option.kind ===
|
|
74
|
+
const argType = option.kind === "enum" ? "string" : option.simpleType;
|
|
50
75
|
cargs.option(option.switch, {
|
|
51
|
-
group: required ?
|
|
76
|
+
group: required ? "Required:" : "Optional:",
|
|
52
77
|
type: argType,
|
|
53
|
-
description: desc.join(
|
|
78
|
+
description: desc.join(" "),
|
|
54
79
|
default: defaultValue,
|
|
55
80
|
required,
|
|
56
81
|
});
|
|
57
82
|
}
|
|
58
83
|
return cargs;
|
|
59
84
|
},
|
|
60
|
-
handler: argv => initProject(process.cwd(), type, argv),
|
|
85
|
+
handler: (argv) => initProject(process.cwd(), type, argv),
|
|
61
86
|
});
|
|
62
87
|
}
|
|
63
88
|
return args;
|
|
@@ -71,7 +96,7 @@ class Command {
|
|
|
71
96
|
// project type is defined but was not matched by yargs, so print the list of supported types
|
|
72
97
|
if (args.projectTypeName) {
|
|
73
98
|
console.log(`Invalid project type ${args.projectTypeName}. Supported types:`);
|
|
74
|
-
for (const pjid of inventory.discover().map(x => x.pjid)) {
|
|
99
|
+
for (const pjid of inventory.discover().map((x) => x.pjid)) {
|
|
75
100
|
console.log(` ${pjid}`);
|
|
76
101
|
}
|
|
77
102
|
return;
|
|
@@ -100,7 +125,7 @@ function commandLineToProps(cwd, type, argv) {
|
|
|
100
125
|
const props = {};
|
|
101
126
|
// initialize props with default values
|
|
102
127
|
for (const prop of type.options) {
|
|
103
|
-
if (prop.default && prop.default !==
|
|
128
|
+
if (prop.default && prop.default !== "undefined" && !prop.optional) {
|
|
104
129
|
props[prop.name] = renderDefault(cwd, prop.default);
|
|
105
130
|
}
|
|
106
131
|
}
|
|
@@ -135,7 +160,7 @@ function commandLineToProps(cwd, type, argv) {
|
|
|
135
160
|
*/
|
|
136
161
|
async function initProjectFromModule(baseDir, spec, args) {
|
|
137
162
|
var _a, _b;
|
|
138
|
-
const projenVersion = (_a = args.projenVersion) !== null && _a !== void 0 ? _a :
|
|
163
|
+
const projenVersion = (_a = args.projenVersion) !== null && _a !== void 0 ? _a : "latest";
|
|
139
164
|
const installCommand = util_2.renderInstallCommand(baseDir, `projen@${projenVersion}`);
|
|
140
165
|
if (args.projenVersion) {
|
|
141
166
|
util_1.exec(installCommand, { cwd: baseDir });
|
|
@@ -147,46 +172,48 @@ async function initProjectFromModule(baseDir, spec, args) {
|
|
|
147
172
|
const moduleName = util_2.installPackage(baseDir, spec);
|
|
148
173
|
// Find the just installed package and discover the rest recursively from this package folder
|
|
149
174
|
const moduleDir = path.dirname(require.resolve(`${moduleName}/.jsii`, {
|
|
150
|
-
paths: [
|
|
151
|
-
baseDir,
|
|
152
|
-
],
|
|
175
|
+
paths: [baseDir],
|
|
153
176
|
}));
|
|
154
177
|
// Only leave projects from the main (requested) package
|
|
155
178
|
const projects = inventory
|
|
156
179
|
.discover(moduleDir)
|
|
157
|
-
.filter(x => x.moduleName === moduleName); // Only list project types from the requested 'from' module
|
|
180
|
+
.filter((x) => x.moduleName === moduleName); // Only list project types from the requested 'from' module
|
|
158
181
|
if (projects.length < 1) {
|
|
159
182
|
throw new Error(`No projects found after installing ${spec}. The module must export at least one class which extends projen.Project`);
|
|
160
183
|
}
|
|
161
184
|
const requested = args.projectTypeName;
|
|
162
|
-
const types = projects.map(p => p.pjid);
|
|
185
|
+
const types = projects.map((p) => p.pjid);
|
|
163
186
|
// if user did not specify a project type but the module has more than one, we need them to tell us which one...
|
|
164
187
|
if (!requested && projects.length > 1) {
|
|
165
|
-
throw new Error(`Multiple projects found after installing ${spec}: ${types.join(
|
|
188
|
+
throw new Error(`Multiple projects found after installing ${spec}: ${types.join(",")}. Please specify a project name.\nExample: npx projen new --from ${spec} ${types[0]}`);
|
|
166
189
|
}
|
|
167
190
|
// if user did not specify a type (and we know we have only one), the select it. otherwise, search by pjid.
|
|
168
|
-
const type = !requested
|
|
191
|
+
const type = !requested
|
|
192
|
+
? projects[0]
|
|
193
|
+
: projects.find((p) => p.pjid === requested);
|
|
169
194
|
if (!type) {
|
|
170
|
-
throw new Error(`Project type ${requested} not found. Found ${types.join(
|
|
195
|
+
throw new Error(`Project type ${requested} not found. Found ${types.join(",")}`);
|
|
171
196
|
}
|
|
172
197
|
for (const option of (_b = type.options) !== null && _b !== void 0 ? _b : []) {
|
|
173
|
-
if (option.simpleType !==
|
|
198
|
+
if (option.simpleType !== "string" &&
|
|
199
|
+
option.simpleType !== "number" &&
|
|
200
|
+
option.simpleType !== "boolean") {
|
|
174
201
|
continue; // we don't support non-primitive fields as command line options
|
|
175
202
|
}
|
|
176
203
|
if (args[option.name] !== undefined) {
|
|
177
|
-
if (option.simpleType ===
|
|
204
|
+
if (option.simpleType === "number") {
|
|
178
205
|
args[option.name] = parseInt(args[option.name]);
|
|
179
206
|
args[option.switch] = args[option.name];
|
|
180
207
|
}
|
|
181
|
-
else if (option.simpleType ===
|
|
208
|
+
else if (option.simpleType === "boolean") {
|
|
182
209
|
const raw = args[option.name];
|
|
183
|
-
const safe = typeof raw ===
|
|
210
|
+
const safe = typeof raw === "string" ? util_1.isTruthy(raw) : raw;
|
|
184
211
|
args[option.name] = safe;
|
|
185
212
|
args[option.switch] = safe;
|
|
186
213
|
}
|
|
187
214
|
continue; // do not overwrite passed arguments
|
|
188
215
|
}
|
|
189
|
-
if (option.default && option.default !==
|
|
216
|
+
if (option.default && option.default !== "undefined") {
|
|
190
217
|
if (!option.optional) {
|
|
191
218
|
const defaultValue = renderDefault(baseDir, option.default);
|
|
192
219
|
args[option.name] = defaultValue;
|
|
@@ -196,7 +223,7 @@ async function initProjectFromModule(baseDir, spec, args) {
|
|
|
196
223
|
}
|
|
197
224
|
// include a dev dependency for the external module
|
|
198
225
|
args.devDeps = [spec];
|
|
199
|
-
args[
|
|
226
|
+
args["dev-deps"] = [spec];
|
|
200
227
|
await initProject(baseDir, type, args);
|
|
201
228
|
}
|
|
202
229
|
/**
|
|
@@ -213,19 +240,21 @@ async function initProject(baseDir, type, args) {
|
|
|
213
240
|
dir: (_a = props.outdir) !== null && _a !== void 0 ? _a : baseDir,
|
|
214
241
|
projectFqn: type.fqn,
|
|
215
242
|
projectOptions: props,
|
|
216
|
-
optionHints: args.comments
|
|
243
|
+
optionHints: args.comments
|
|
244
|
+
? option_hints_1.InitProjectOptionHints.FEATURED
|
|
245
|
+
: option_hints_1.InitProjectOptionHints.NONE,
|
|
217
246
|
synth: args.synth,
|
|
218
247
|
post: args.post,
|
|
219
248
|
});
|
|
220
|
-
if (fs.existsSync(path.join(baseDir,
|
|
221
|
-
util_1.exec(
|
|
249
|
+
if (fs.existsSync(path.join(baseDir, "package.json")) && args.post) {
|
|
250
|
+
util_1.exec("npm run eslint --if-present", { cwd: baseDir });
|
|
222
251
|
}
|
|
223
252
|
if (args.git) {
|
|
224
253
|
const git = (cmd) => util_1.exec(`git ${cmd}`, { cwd: baseDir });
|
|
225
|
-
git(
|
|
226
|
-
git(
|
|
254
|
+
git("init -b main");
|
|
255
|
+
git("add .");
|
|
227
256
|
git('commit --allow-empty -m "chore: project created with projen"');
|
|
228
257
|
}
|
|
229
258
|
}
|
|
230
259
|
module.exports = new Command();
|
|
231
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../src/cli/cmds/new.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs-extra';\nimport * as yargs from 'yargs';\nimport * as inventory from '../../inventory';\nimport { InitProjectOptionHints } from '../../option-hints';\nimport { Projects } from '../../projects';\nimport { exec, isTruthy } from '../../util';\nimport { tryProcessMacro } from '../macros';\nimport { installPackage, renderInstallCommand } from '../util';\n\nclass Command implements yargs.CommandModule {\n  public readonly command = 'new [PROJECT-TYPE-NAME] [OPTIONS]';\n  public readonly describe = 'Creates a new projen project';\n\n  public builder(args: yargs.Argv) {\n    args.positional('PROJECT-TYPE-NAME', { describe: 'optional only when --from is used and there is a single project type in the external module', type: 'string' });\n    args.option('synth', { type: 'boolean', default: true, desc: 'Synthesize after creating .projenrc.js' });\n    args.option('comments', { type: 'boolean', default: true, desc: 'Include commented out options in .projenrc.js (use --no-comments to disable)' });\n    args.option('from', { type: 'string', alias: 'f', desc: 'External jsii npm module to create project from. Supports any package spec supported by npm (such as \"my-pack@^2.0\")' });\n    args.option('git', { type: 'boolean', default: true, desc: 'Run `git init` and create an initial commit (use --no-git to disable)' });\n    args.example('projen new awscdk-app-ts', 'Creates a new project of built-in type \"awscdk-app-ts\"');\n    args.example('projen new --from projen-vue@^2', 'Creates a new project from an external module \"projen-vue\" with the specified version');\n\n    for (const type of inventory.discover()) {\n      args.command(type.pjid, type.docs ?? '', {\n        builder: cargs => {\n          cargs.showHelpOnFail(false);\n\n          for (const option of type.options ?? []) {\n            if (option.simpleType !== 'string' && option.simpleType !== 'number' && option.simpleType !== 'boolean' && option.kind !== 'enum') {\n              continue; // we only support primitive and enum fields as command line options\n            }\n\n            let desc = [option.docs?.replace(/\\ *\\.$/, '') ?? ''];\n\n            const required = !option.optional;\n            let defaultValue;\n\n            if (option.default && option.default !== 'undefined') {\n              if (!required) {\n                // if the field is not required, just describe the default but don't actually assign a value\n                desc.push(`[default: ${option.default.replace(/^\\ *-/, '').replace(/\\.$/, '').trim()}]`);\n              } else {\n                // if the field is required and we have a @default, then assign\n                // the value here so it appears in `--help`\n                defaultValue = renderDefault(process.cwd(), option.default);\n              }\n            }\n\n            const argType = option.kind === 'enum' ? 'string' : option.simpleType;\n\n            cargs.option(option.switch, {\n              group: required ? 'Required:' : 'Optional:',\n              type: (argType as 'string' | 'boolean' | 'number'),\n              description: desc.join(' '),\n              default: defaultValue,\n              required,\n            });\n          }\n\n          return cargs;\n        },\n        handler: argv => initProject(process.cwd(), type, argv),\n      });\n    }\n\n    return args;\n  }\n\n  public async handler(args: any) {\n    // handle --from which means we want to first install a jsii module and then\n    // create a project defined within this module.\n    if (args.from) {\n      return initProjectFromModule(process.cwd(), args.from, args);\n    }\n\n    // project type is defined but was not matched by yargs, so print the list of supported types\n    if (args.projectTypeName) {\n      console.log(`Invalid project type ${args.projectTypeName}. Supported types:`);\n      for (const pjid of inventory.discover().map(x => x.pjid)) {\n        console.log(`  ${pjid}`);\n      }\n      return;\n    }\n\n    // Handles the use case that nothing was specified since PROJECT-TYPE is now an optional positional parameter\n    yargs.showHelp();\n  }\n}\n\n\n/**\n * Given a value from \"@default\", processes macros and returns a stringified\n * (quoted) result.\n *\n * @returns a javascript primitive (could be a string, number or boolean)\n */\nfunction renderDefault(cwd: string, value: string) {\n  return tryProcessMacro(cwd, value) ?? JSON.parse(value);\n}\n\n/**\n * Converts yargs command line switches to project type props.\n * @param type Project type\n * @param argv Command line switches\n */\nfunction commandLineToProps(cwd: string, type: inventory.ProjectType, argv: Record<string, unknown>): Record<string, any> {\n  const props: Record<string, any> = {};\n\n  // initialize props with default values\n  for (const prop of type.options) {\n    if (prop.default && prop.default !== 'undefined' && !prop.optional) {\n      props[prop.name] = renderDefault(cwd, prop.default);\n    }\n  }\n\n  for (const [arg, value] of Object.entries(argv)) {\n    for (const prop of type.options) {\n      if (prop.switch === arg) {\n        let curr = props;\n        const queue = [...prop.path];\n        while (true) {\n          const p = queue.shift();\n          if (!p) {\n            break;\n          }\n          if (queue.length === 0) {\n            curr[p] = value;\n          } else {\n            curr[p] = curr[p] ?? {};\n            curr = curr[p];\n          }\n        }\n      }\n    }\n  }\n\n  return props;\n}\n\n/**\n * Generates a new project from an external module.\n *\n * @param spec The name of the external module to load\n * @param args Command line arguments (incl. project type)\n */\nasync function initProjectFromModule(baseDir: string, spec: string, args: any) {\n  const projenVersion = args.projenVersion ?? 'latest';\n  const installCommand = renderInstallCommand(baseDir, `projen@${projenVersion}`);\n  if (args.projenVersion) {\n    exec(installCommand, { cwd: baseDir });\n  } else {\n    // do not overwrite existing installation\n    exec(`npm ls --prefix=${baseDir} --depth=0 --pattern projen || ${installCommand}`, { cwd: baseDir });\n  }\n\n  const moduleName = installPackage(baseDir, spec);\n\n  // Find the just installed package and discover the rest recursively from this package folder\n  const moduleDir = path.dirname(require.resolve(`${moduleName}/.jsii`, {\n    paths: [\n      baseDir,\n    ],\n  }));\n\n  // Only leave projects from the main (requested) package\n  const projects = inventory\n    .discover(moduleDir)\n    .filter(x => x.moduleName === moduleName); // Only list project types from the requested 'from' module\n\n  if (projects.length < 1) {\n    throw new Error(`No projects found after installing ${spec}. The module must export at least one class which extends projen.Project`);\n  }\n\n  const requested = args.projectTypeName;\n  const types = projects.map(p => p.pjid);\n\n  // if user did not specify a project type but the module has more than one, we need them to tell us which one...\n  if (!requested && projects.length > 1) {\n    throw new Error(`Multiple projects found after installing ${spec}: ${types.join(',')}. Please specify a project name.\\nExample: npx projen new --from ${spec} ${types[0]}`);\n  }\n\n  // if user did not specify a type (and we know we have only one), the select it. otherwise, search by pjid.\n  const type = !requested ? projects[0] : projects.find(p => p.pjid === requested);\n  if (!type) {\n    throw new Error(`Project type ${requested} not found. Found ${types.join(',')}`);\n  }\n\n  for (const option of type.options ?? []) {\n    if (option.simpleType !== 'string' && option.simpleType !== 'number' && option.simpleType !== 'boolean') {\n      continue; // we don't support non-primitive fields as command line options\n    }\n\n    if (args[option.name] !== undefined) {\n      if (option.simpleType === 'number') {\n        args[option.name] = parseInt(args[option.name]);\n        args[option.switch] = args[option.name];\n      } else if (option.simpleType === 'boolean') {\n        const raw = args[option.name];\n        const safe = typeof raw === 'string' ? isTruthy(raw) : raw;\n        args[option.name] = safe;\n        args[option.switch] = safe;\n      }\n      continue; // do not overwrite passed arguments\n    }\n\n    if (option.default && option.default !== 'undefined') {\n      if (!option.optional) {\n        const defaultValue = renderDefault(baseDir, option.default);\n        args[option.name] = defaultValue;\n        args[option.switch] = defaultValue;\n      }\n    }\n  }\n\n  // include a dev dependency for the external module\n  args.devDeps = [spec];\n  args['dev-deps'] = [spec];\n\n  await initProject(baseDir, type, args);\n}\n\n/**\n * Generates a new project.\n * @param type Project type\n * @param args Command line arguments\n * @param additionalProps Additional parameters to include in .projenrc.js\n */\nasync function initProject(baseDir: string, type: inventory.ProjectType, args: any) {\n  // convert command line arguments to project props using type information\n  const props = commandLineToProps(baseDir, type, args);\n\n  Projects.createProject({\n    dir: props.outdir ?? baseDir,\n    projectFqn: type.fqn,\n    projectOptions: props,\n    optionHints: args.comments ? InitProjectOptionHints.FEATURED : InitProjectOptionHints.NONE,\n    synth: args.synth,\n    post: args.post,\n  });\n\n  if (fs.existsSync(path.join(baseDir, 'package.json')) && args.post) {\n    exec('npm run eslint --if-present', { cwd: baseDir });\n  }\n\n  if (args.git) {\n    const git = (cmd: string) => exec(`git ${cmd}`, { cwd: baseDir });\n    git('init -b main');\n    git('add .');\n    git('commit --allow-empty -m \"chore: project created with projen\"');\n  }\n}\n\nmodule.exports = new Command();\n"]}
|
|
260
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../src/cli/cmds/new.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from \"path\";\nimport * as fs from \"fs-extra\";\nimport * as yargs from \"yargs\";\nimport * as inventory from \"../../inventory\";\nimport { InitProjectOptionHints } from \"../../option-hints\";\nimport { Projects } from \"../../projects\";\nimport { exec, isTruthy } from \"../../util\";\nimport { tryProcessMacro } from \"../macros\";\nimport { installPackage, renderInstallCommand } from \"../util\";\n\nclass Command implements yargs.CommandModule {\n  public readonly command = \"new [PROJECT-TYPE-NAME] [OPTIONS]\";\n  public readonly describe = \"Creates a new projen project\";\n\n  public builder(args: yargs.Argv) {\n    args.positional(\"PROJECT-TYPE-NAME\", {\n      describe:\n        \"optional only when --from is used and there is a single project type in the external module\",\n      type: \"string\",\n    });\n    args.option(\"synth\", {\n      type: \"boolean\",\n      default: true,\n      desc: \"Synthesize after creating .projenrc.js\",\n    });\n    args.option(\"comments\", {\n      type: \"boolean\",\n      default: true,\n      desc: \"Include commented out options in .projenrc.js (use --no-comments to disable)\",\n    });\n    args.option(\"from\", {\n      type: \"string\",\n      alias: \"f\",\n      desc: 'External jsii npm module to create project from. Supports any package spec supported by npm (such as \"my-pack@^2.0\")',\n    });\n    args.option(\"git\", {\n      type: \"boolean\",\n      default: true,\n      desc: \"Run `git init` and create an initial commit (use --no-git to disable)\",\n    });\n    args.example(\n      \"projen new awscdk-app-ts\",\n      'Creates a new project of built-in type \"awscdk-app-ts\"'\n    );\n    args.example(\n      \"projen new --from projen-vue@^2\",\n      'Creates a new project from an external module \"projen-vue\" with the specified version'\n    );\n\n    for (const type of inventory.discover()) {\n      args.command(type.pjid, type.docs ?? \"\", {\n        builder: (cargs) => {\n          cargs.showHelpOnFail(false);\n\n          for (const option of type.options ?? []) {\n            if (\n              option.simpleType !== \"string\" &&\n              option.simpleType !== \"number\" &&\n              option.simpleType !== \"boolean\" &&\n              option.kind !== \"enum\"\n            ) {\n              continue; // we only support primitive and enum fields as command line options\n            }\n\n            let desc = [option.docs?.replace(/\\ *\\.$/, \"\") ?? \"\"];\n\n            const required = !option.optional;\n            let defaultValue;\n\n            if (option.default && option.default !== \"undefined\") {\n              if (!required) {\n                // if the field is not required, just describe the default but don't actually assign a value\n                desc.push(\n                  `[default: ${option.default\n                    .replace(/^\\ *-/, \"\")\n                    .replace(/\\.$/, \"\")\n                    .trim()}]`\n                );\n              } else {\n                // if the field is required and we have a @default, then assign\n                // the value here so it appears in `--help`\n                defaultValue = renderDefault(process.cwd(), option.default);\n              }\n            }\n\n            const argType =\n              option.kind === \"enum\" ? \"string\" : option.simpleType;\n\n            cargs.option(option.switch, {\n              group: required ? \"Required:\" : \"Optional:\",\n              type: argType as \"string\" | \"boolean\" | \"number\",\n              description: desc.join(\" \"),\n              default: defaultValue,\n              required,\n            });\n          }\n\n          return cargs;\n        },\n        handler: (argv) => initProject(process.cwd(), type, argv),\n      });\n    }\n\n    return args;\n  }\n\n  public async handler(args: any) {\n    // handle --from which means we want to first install a jsii module and then\n    // create a project defined within this module.\n    if (args.from) {\n      return initProjectFromModule(process.cwd(), args.from, args);\n    }\n\n    // project type is defined but was not matched by yargs, so print the list of supported types\n    if (args.projectTypeName) {\n      console.log(\n        `Invalid project type ${args.projectTypeName}. Supported types:`\n      );\n      for (const pjid of inventory.discover().map((x) => x.pjid)) {\n        console.log(`  ${pjid}`);\n      }\n      return;\n    }\n\n    // Handles the use case that nothing was specified since PROJECT-TYPE is now an optional positional parameter\n    yargs.showHelp();\n  }\n}\n\n/**\n * Given a value from \"@default\", processes macros and returns a stringified\n * (quoted) result.\n *\n * @returns a javascript primitive (could be a string, number or boolean)\n */\nfunction renderDefault(cwd: string, value: string) {\n  return tryProcessMacro(cwd, value) ?? JSON.parse(value);\n}\n\n/**\n * Converts yargs command line switches to project type props.\n * @param type Project type\n * @param argv Command line switches\n */\nfunction commandLineToProps(\n  cwd: string,\n  type: inventory.ProjectType,\n  argv: Record<string, unknown>\n): Record<string, any> {\n  const props: Record<string, any> = {};\n\n  // initialize props with default values\n  for (const prop of type.options) {\n    if (prop.default && prop.default !== \"undefined\" && !prop.optional) {\n      props[prop.name] = renderDefault(cwd, prop.default);\n    }\n  }\n\n  for (const [arg, value] of Object.entries(argv)) {\n    for (const prop of type.options) {\n      if (prop.switch === arg) {\n        let curr = props;\n        const queue = [...prop.path];\n        while (true) {\n          const p = queue.shift();\n          if (!p) {\n            break;\n          }\n          if (queue.length === 0) {\n            curr[p] = value;\n          } else {\n            curr[p] = curr[p] ?? {};\n            curr = curr[p];\n          }\n        }\n      }\n    }\n  }\n\n  return props;\n}\n\n/**\n * Generates a new project from an external module.\n *\n * @param spec The name of the external module to load\n * @param args Command line arguments (incl. project type)\n */\nasync function initProjectFromModule(baseDir: string, spec: string, args: any) {\n  const projenVersion = args.projenVersion ?? \"latest\";\n  const installCommand = renderInstallCommand(\n    baseDir,\n    `projen@${projenVersion}`\n  );\n  if (args.projenVersion) {\n    exec(installCommand, { cwd: baseDir });\n  } else {\n    // do not overwrite existing installation\n    exec(\n      `npm ls --prefix=${baseDir} --depth=0 --pattern projen || ${installCommand}`,\n      { cwd: baseDir }\n    );\n  }\n\n  const moduleName = installPackage(baseDir, spec);\n\n  // Find the just installed package and discover the rest recursively from this package folder\n  const moduleDir = path.dirname(\n    require.resolve(`${moduleName}/.jsii`, {\n      paths: [baseDir],\n    })\n  );\n\n  // Only leave projects from the main (requested) package\n  const projects = inventory\n    .discover(moduleDir)\n    .filter((x) => x.moduleName === moduleName); // Only list project types from the requested 'from' module\n\n  if (projects.length < 1) {\n    throw new Error(\n      `No projects found after installing ${spec}. The module must export at least one class which extends projen.Project`\n    );\n  }\n\n  const requested = args.projectTypeName;\n  const types = projects.map((p) => p.pjid);\n\n  // if user did not specify a project type but the module has more than one, we need them to tell us which one...\n  if (!requested && projects.length > 1) {\n    throw new Error(\n      `Multiple projects found after installing ${spec}: ${types.join(\n        \",\"\n      )}. Please specify a project name.\\nExample: npx projen new --from ${spec} ${\n        types[0]\n      }`\n    );\n  }\n\n  // if user did not specify a type (and we know we have only one), the select it. otherwise, search by pjid.\n  const type = !requested\n    ? projects[0]\n    : projects.find((p) => p.pjid === requested);\n  if (!type) {\n    throw new Error(\n      `Project type ${requested} not found. Found ${types.join(\",\")}`\n    );\n  }\n\n  for (const option of type.options ?? []) {\n    if (\n      option.simpleType !== \"string\" &&\n      option.simpleType !== \"number\" &&\n      option.simpleType !== \"boolean\"\n    ) {\n      continue; // we don't support non-primitive fields as command line options\n    }\n\n    if (args[option.name] !== undefined) {\n      if (option.simpleType === \"number\") {\n        args[option.name] = parseInt(args[option.name]);\n        args[option.switch] = args[option.name];\n      } else if (option.simpleType === \"boolean\") {\n        const raw = args[option.name];\n        const safe = typeof raw === \"string\" ? isTruthy(raw) : raw;\n        args[option.name] = safe;\n        args[option.switch] = safe;\n      }\n      continue; // do not overwrite passed arguments\n    }\n\n    if (option.default && option.default !== \"undefined\") {\n      if (!option.optional) {\n        const defaultValue = renderDefault(baseDir, option.default);\n        args[option.name] = defaultValue;\n        args[option.switch] = defaultValue;\n      }\n    }\n  }\n\n  // include a dev dependency for the external module\n  args.devDeps = [spec];\n  args[\"dev-deps\"] = [spec];\n\n  await initProject(baseDir, type, args);\n}\n\n/**\n * Generates a new project.\n * @param type Project type\n * @param args Command line arguments\n * @param additionalProps Additional parameters to include in .projenrc.js\n */\nasync function initProject(\n  baseDir: string,\n  type: inventory.ProjectType,\n  args: any\n) {\n  // convert command line arguments to project props using type information\n  const props = commandLineToProps(baseDir, type, args);\n\n  Projects.createProject({\n    dir: props.outdir ?? baseDir,\n    projectFqn: type.fqn,\n    projectOptions: props,\n    optionHints: args.comments\n      ? InitProjectOptionHints.FEATURED\n      : InitProjectOptionHints.NONE,\n    synth: args.synth,\n    post: args.post,\n  });\n\n  if (fs.existsSync(path.join(baseDir, \"package.json\")) && args.post) {\n    exec(\"npm run eslint --if-present\", { cwd: baseDir });\n  }\n\n  if (args.git) {\n    const git = (cmd: string) => exec(`git ${cmd}`, { cwd: baseDir });\n    git(\"init -b main\");\n    git(\"add .\");\n    git('commit --allow-empty -m \"chore: project created with projen\"');\n  }\n}\n\nmodule.exports = new Command();\n"]}
|
package/lib/cli/index.js
CHANGED
|
@@ -9,26 +9,43 @@ const tasks_1 = require("./tasks");
|
|
|
9
9
|
const DEFAULT_RC = path_1.resolve(common_1.PROJEN_RC);
|
|
10
10
|
async function main() {
|
|
11
11
|
const ya = yargs;
|
|
12
|
-
ya.commandDir(
|
|
13
|
-
const runtime = new task_runtime_1.TaskRuntime(
|
|
12
|
+
ya.commandDir("cmds");
|
|
13
|
+
const runtime = new task_runtime_1.TaskRuntime(".");
|
|
14
14
|
tasks_1.discoverTaskCommands(runtime, ya);
|
|
15
15
|
ya.recommendCommands();
|
|
16
16
|
ya.strictCommands();
|
|
17
17
|
ya.showHelpOnFail(false);
|
|
18
18
|
ya.wrap(yargs.terminalWidth());
|
|
19
|
-
ya.option(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
ya.option("post", {
|
|
20
|
+
type: "boolean",
|
|
21
|
+
default: true,
|
|
22
|
+
desc: "Run post-synthesis steps such as installing dependencies. Use --no-post to skip",
|
|
23
|
+
});
|
|
24
|
+
ya.option("watch", {
|
|
25
|
+
type: "boolean",
|
|
26
|
+
default: false,
|
|
27
|
+
desc: "Keep running and resynthesize when projenrc changes",
|
|
28
|
+
alias: "w",
|
|
29
|
+
});
|
|
30
|
+
ya.options("debug", { type: "boolean", default: false, desc: "Debug logs" });
|
|
31
|
+
ya.options("rc", {
|
|
32
|
+
desc: "path to .projenrc.js file",
|
|
33
|
+
default: DEFAULT_RC,
|
|
34
|
+
type: "string",
|
|
35
|
+
});
|
|
23
36
|
ya.completion();
|
|
24
37
|
ya.help();
|
|
25
38
|
// do not use the default yargs '--version' implementation since it is
|
|
26
39
|
// global by default (it appears on all subcommands)
|
|
27
40
|
ya.version(false);
|
|
28
|
-
ya.option(
|
|
41
|
+
ya.option("version", {
|
|
42
|
+
type: "boolean",
|
|
43
|
+
description: "Show version number",
|
|
44
|
+
global: false,
|
|
45
|
+
});
|
|
29
46
|
const args = ya.argv;
|
|
30
47
|
if (args.debug) {
|
|
31
|
-
process.env.DEBUG =
|
|
48
|
+
process.env.DEBUG = "true";
|
|
32
49
|
}
|
|
33
50
|
// no command means synthesize
|
|
34
51
|
if (args._.length === 0) {
|
|
@@ -43,8 +60,8 @@ async function main() {
|
|
|
43
60
|
});
|
|
44
61
|
}
|
|
45
62
|
}
|
|
46
|
-
main().catch(e => {
|
|
63
|
+
main().catch((e) => {
|
|
47
64
|
console.error(e.stack);
|
|
48
65
|
process.exit(1);
|
|
49
66
|
});
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQStCO0FBQy9CLCtCQUErQjtBQUMvQixzQ0FBc0Q7QUFDdEQsa0RBQThDO0FBQzlDLG1DQUFnQztBQUNoQyxtQ0FBK0M7QUFFL0MsTUFBTSxVQUFVLEdBQUcsY0FBTyxDQUFDLGtCQUFTLENBQUMsQ0FBQztBQUV0QyxLQUFLLFVBQVUsSUFBSTtJQUNqQixNQUFNLEVBQUUsR0FBRyxLQUFLLENBQUM7SUFDakIsRUFBRSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUV0QixNQUFNLE9BQU8sR0FBRyxJQUFJLDBCQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDckMsNEJBQW9CLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRWxDLEVBQUUsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQ3ZCLEVBQUUsQ0FBQyxjQUFjLEVBQUUsQ0FBQztJQUNwQixFQUFFLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3pCLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxDQUFDLENBQUM7SUFDL0IsRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7UUFDaEIsSUFBSSxFQUFFLFNBQVM7UUFDZixPQUFPLEVBQUUsSUFBSTtRQUNiLElBQUksRUFBRSxpRkFBaUY7S0FDeEYsQ0FBQyxDQUFDO0lBQ0gsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7UUFDakIsSUFBSSxFQUFFLFNBQVM7UUFDZixPQUFPLEVBQUUsS0FBSztRQUNkLElBQUksRUFBRSxxREFBcUQ7UUFDM0QsS0FBSyxFQUFFLEdBQUc7S0FDWCxDQUFDLENBQUM7SUFDSCxFQUFFLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUMsQ0FBQztJQUM3RSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtRQUNmLElBQUksRUFBRSwyQkFBMkI7UUFDakMsT0FBTyxFQUFFLFVBQVU7UUFDbkIsSUFBSSxFQUFFLFFBQVE7S0FDZixDQUFDLENBQUM7SUFDSCxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDaEIsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBRVYsc0VBQXNFO0lBQ3RFLG9EQUFvRDtJQUNwRCxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2xCLEVBQUUsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO1FBQ25CLElBQUksRUFBRSxTQUFTO1FBQ2YsV0FBVyxFQUFFLHFCQUFxQjtRQUNsQyxNQUFNLEVBQUUsS0FBSztLQUNkLENBQUMsQ0FBQztJQUVILE1BQU0sSUFBSSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFFckIsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFO1FBQ2QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDO0tBQzVCO0lBRUQsOEJBQThCO0lBQzlCLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3ZCLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRTtZQUNoQixPQUFPLENBQUMsR0FBRyxDQUFDLHVCQUFjLENBQUMsQ0FBQztZQUM1QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxhQUFLLENBQUMsT0FBTyxFQUFFO1lBQ25CLElBQUksRUFBRSxJQUFJLENBQUMsSUFBZTtZQUMxQixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQWdCO1lBQzVCLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBWTtTQUMxQixDQUFDLENBQUM7S0FDSjtBQUNILENBQUM7QUFFRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtJQUNqQixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN2QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVzb2x2ZSB9IGZyb20gXCJwYXRoXCI7XG5pbXBvcnQgKiBhcyB5YXJncyBmcm9tIFwieWFyZ3NcIjtcbmltcG9ydCB7IFBST0pFTl9SQywgUFJPSkVOX1ZFUlNJT04gfSBmcm9tIFwiLi4vY29tbW9uXCI7XG5pbXBvcnQgeyBUYXNrUnVudGltZSB9IGZyb20gXCIuLi90YXNrLXJ1bnRpbWVcIjtcbmltcG9ydCB7IHN5bnRoIH0gZnJvbSBcIi4vc3ludGhcIjtcbmltcG9ydCB7IGRpc2NvdmVyVGFza0NvbW1hbmRzIH0gZnJvbSBcIi4vdGFza3NcIjtcblxuY29uc3QgREVGQVVMVF9SQyA9IHJlc29sdmUoUFJPSkVOX1JDKTtcblxuYXN5bmMgZnVuY3Rpb24gbWFpbigpIHtcbiAgY29uc3QgeWEgPSB5YXJncztcbiAgeWEuY29tbWFuZERpcihcImNtZHNcIik7XG5cbiAgY29uc3QgcnVudGltZSA9IG5ldyBUYXNrUnVudGltZShcIi5cIik7XG4gIGRpc2NvdmVyVGFza0NvbW1hbmRzKHJ1bnRpbWUsIHlhKTtcblxuICB5YS5yZWNvbW1lbmRDb21tYW5kcygpO1xuICB5YS5zdHJpY3RDb21tYW5kcygpO1xuICB5YS5zaG93SGVscE9uRmFpbChmYWxzZSk7XG4gIHlhLndyYXAoeWFyZ3MudGVybWluYWxXaWR0aCgpKTtcbiAgeWEub3B0aW9uKFwicG9zdFwiLCB7XG4gICAgdHlwZTogXCJib29sZWFuXCIsXG4gICAgZGVmYXVsdDogdHJ1ZSxcbiAgICBkZXNjOiBcIlJ1biBwb3N0LXN5bnRoZXNpcyBzdGVwcyBzdWNoIGFzIGluc3RhbGxpbmcgZGVwZW5kZW5jaWVzLiBVc2UgLS1uby1wb3N0IHRvIHNraXBcIixcbiAgfSk7XG4gIHlhLm9wdGlvbihcIndhdGNoXCIsIHtcbiAgICB0eXBlOiBcImJvb2xlYW5cIixcbiAgICBkZWZhdWx0OiBmYWxzZSxcbiAgICBkZXNjOiBcIktlZXAgcnVubmluZyBhbmQgcmVzeW50aGVzaXplIHdoZW4gcHJvamVucmMgY2hhbmdlc1wiLFxuICAgIGFsaWFzOiBcIndcIixcbiAgfSk7XG4gIHlhLm9wdGlvbnMoXCJkZWJ1Z1wiLCB7IHR5cGU6IFwiYm9vbGVhblwiLCBkZWZhdWx0OiBmYWxzZSwgZGVzYzogXCJEZWJ1ZyBsb2dzXCIgfSk7XG4gIHlhLm9wdGlvbnMoXCJyY1wiLCB7XG4gICAgZGVzYzogXCJwYXRoIHRvIC5wcm9qZW5yYy5qcyBmaWxlXCIsXG4gICAgZGVmYXVsdDogREVGQVVMVF9SQyxcbiAgICB0eXBlOiBcInN0cmluZ1wiLFxuICB9KTtcbiAgeWEuY29tcGxldGlvbigpO1xuICB5YS5oZWxwKCk7XG5cbiAgLy8gZG8gbm90IHVzZSB0aGUgZGVmYXVsdCB5YXJncyAnLS12ZXJzaW9uJyBpbXBsZW1lbnRhdGlvbiBzaW5jZSBpdCBpc1xuICAvLyBnbG9iYWwgYnkgZGVmYXVsdCAoaXQgYXBwZWFycyBvbiBhbGwgc3ViY29tbWFuZHMpXG4gIHlhLnZlcnNpb24oZmFsc2UpO1xuICB5YS5vcHRpb24oXCJ2ZXJzaW9uXCIsIHtcbiAgICB0eXBlOiBcImJvb2xlYW5cIixcbiAgICBkZXNjcmlwdGlvbjogXCJTaG93IHZlcnNpb24gbnVtYmVyXCIsXG4gICAgZ2xvYmFsOiBmYWxzZSxcbiAgfSk7XG5cbiAgY29uc3QgYXJncyA9IHlhLmFyZ3Y7XG5cbiAgaWYgKGFyZ3MuZGVidWcpIHtcbiAgICBwcm9jZXNzLmVudi5ERUJVRyA9IFwidHJ1ZVwiO1xuICB9XG5cbiAgLy8gbm8gY29tbWFuZCBtZWFucyBzeW50aGVzaXplXG4gIGlmIChhcmdzLl8ubGVuZ3RoID09PSAwKSB7XG4gICAgaWYgKGFyZ3MudmVyc2lvbikge1xuICAgICAgY29uc29sZS5sb2coUFJPSkVOX1ZFUlNJT04pO1xuICAgICAgcHJvY2Vzcy5leGl0KDApO1xuICAgIH1cbiAgICBhd2FpdCBzeW50aChydW50aW1lLCB7XG4gICAgICBwb3N0OiBhcmdzLnBvc3QgYXMgYm9vbGVhbixcbiAgICAgIHdhdGNoOiBhcmdzLndhdGNoIGFzIGJvb2xlYW4sXG4gICAgICByY2ZpbGU6IGFyZ3MucmMgYXMgc3RyaW5nLFxuICAgIH0pO1xuICB9XG59XG5cbm1haW4oKS5jYXRjaCgoZSkgPT4ge1xuICBjb25zb2xlLmVycm9yKGUuc3RhY2spO1xuICBwcm9jZXNzLmV4aXQoMSk7XG59KTtcbiJdfQ==
|
package/lib/cli/macros.js
CHANGED
|
@@ -5,22 +5,26 @@ const path = require("path");
|
|
|
5
5
|
const util_1 = require("../util");
|
|
6
6
|
function tryProcessMacro(cwd, macro) {
|
|
7
7
|
var _a, _b;
|
|
8
|
-
if (!macro.startsWith(
|
|
8
|
+
if (!macro.startsWith("$")) {
|
|
9
9
|
return undefined;
|
|
10
10
|
}
|
|
11
11
|
const basedir = path.basename(cwd);
|
|
12
12
|
switch (macro) {
|
|
13
|
-
case
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
case "$BASEDIR":
|
|
14
|
+
return basedir;
|
|
15
|
+
case "$GIT_REMOTE":
|
|
16
|
+
const origin = util_1.execOrUndefined("git remote get-url origin", { cwd });
|
|
16
17
|
if (origin) {
|
|
17
18
|
return origin;
|
|
18
19
|
}
|
|
19
|
-
const slug = (_a = getFromGitConfig(cwd,
|
|
20
|
+
const slug = (_a = getFromGitConfig(cwd, "github.user")) !== null && _a !== void 0 ? _a : resolveEmail(cwd).split("@")[0];
|
|
20
21
|
return `https://github.com/${slug}/${basedir}.git`;
|
|
21
|
-
case
|
|
22
|
-
|
|
23
|
-
case
|
|
22
|
+
case "$GIT_USER_NAME":
|
|
23
|
+
return (_b = getFromGitConfig(cwd, "user.name")) !== null && _b !== void 0 ? _b : "user";
|
|
24
|
+
case "$GIT_USER_EMAIL":
|
|
25
|
+
return resolveEmail(cwd);
|
|
26
|
+
case "$PYTHON_MODULE_NAME":
|
|
27
|
+
return util_1.formatAsPythonModule(basedir);
|
|
24
28
|
}
|
|
25
29
|
return undefined;
|
|
26
30
|
}
|
|
@@ -31,10 +35,10 @@ exports.tryProcessMacro = tryProcessMacro;
|
|
|
31
35
|
*/
|
|
32
36
|
function getFromGitConfig(cwd, key) {
|
|
33
37
|
var _a;
|
|
34
|
-
return (_a = util_1.execOrUndefined(`git config --get --includes ${key}`, { cwd })) !== null && _a !== void 0 ? _a : util_1.execOrUndefined(`git config --get --global --includes ${key}`, { cwd });
|
|
38
|
+
return ((_a = util_1.execOrUndefined(`git config --get --includes ${key}`, { cwd })) !== null && _a !== void 0 ? _a : util_1.execOrUndefined(`git config --get --global --includes ${key}`, { cwd }));
|
|
35
39
|
}
|
|
36
40
|
function resolveEmail(cwd) {
|
|
37
41
|
var _a;
|
|
38
|
-
return (_a = getFromGitConfig(cwd,
|
|
42
|
+
return (_a = getFromGitConfig(cwd, "user.email")) !== null && _a !== void 0 ? _a : "user@domain.com";
|
|
39
43
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFjcm9zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9tYWNyb3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQTZCO0FBQzdCLGtDQUFnRTtBQUVoRSxTQUFnQixlQUFlLENBQUMsR0FBVyxFQUFFLEtBQWE7O0lBQ3hELElBQUksQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQzFCLE9BQU8sU0FBUyxDQUFDO0tBQ2xCO0lBRUQsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUVuQyxRQUFRLEtBQUssRUFBRTtRQUNiLEtBQUssVUFBVTtZQUNiLE9BQU8sT0FBTyxDQUFDO1FBQ2pCLEtBQUssYUFBYTtZQUNoQixNQUFNLE1BQU0sR0FBRyxzQkFBZSxDQUFDLDJCQUEyQixFQUFFLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNyRSxJQUFJLE1BQU0sRUFBRTtnQkFDVixPQUFPLE1BQU0sQ0FBQzthQUNmO1lBQ0QsTUFBTSxJQUFJLFNBQ1IsZ0JBQWdCLENBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQyxtQ0FBSSxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzFFLE9BQU8sc0JBQXNCLElBQUksSUFBSSxPQUFPLE1BQU0sQ0FBQztRQUVyRCxLQUFLLGdCQUFnQjtZQUNuQixhQUFPLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxXQUFXLENBQUMsbUNBQUksTUFBTSxDQUFDO1FBQ3RELEtBQUssaUJBQWlCO1lBQ3BCLE9BQU8sWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzNCLEtBQUsscUJBQXFCO1lBQ3hCLE9BQU8sMkJBQW9CLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDeEM7SUFFRCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDO0FBNUJELDBDQTRCQztBQUVEOzs7R0FHRztBQUNILFNBQVMsZ0JBQWdCLENBQUMsR0FBVyxFQUFFLEdBQVc7O0lBQ2hELE9BQU8sT0FDTCxzQkFBZSxDQUFDLCtCQUErQixHQUFHLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxDQUFDLG1DQUM5RCxzQkFBZSxDQUFDLHdDQUF3QyxHQUFHLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQ3hFLENBQUM7QUFDSixDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsR0FBVzs7SUFDL0IsYUFBTyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsWUFBWSxDQUFDLG1DQUFJLGlCQUFpQixDQUFDO0FBQ2xFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBwYXRoIGZyb20gXCJwYXRoXCI7XG5pbXBvcnQgeyBleGVjT3JVbmRlZmluZWQsIGZvcm1hdEFzUHl0aG9uTW9kdWxlIH0gZnJvbSBcIi4uL3V0aWxcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIHRyeVByb2Nlc3NNYWNybyhjd2Q6IHN0cmluZywgbWFjcm86IHN0cmluZykge1xuICBpZiAoIW1hY3JvLnN0YXJ0c1dpdGgoXCIkXCIpKSB7XG4gICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgfVxuXG4gIGNvbnN0IGJhc2VkaXIgPSBwYXRoLmJhc2VuYW1lKGN3ZCk7XG5cbiAgc3dpdGNoIChtYWNybykge1xuICAgIGNhc2UgXCIkQkFTRURJUlwiOlxuICAgICAgcmV0dXJuIGJhc2VkaXI7XG4gICAgY2FzZSBcIiRHSVRfUkVNT1RFXCI6XG4gICAgICBjb25zdCBvcmlnaW4gPSBleGVjT3JVbmRlZmluZWQoXCJnaXQgcmVtb3RlIGdldC11cmwgb3JpZ2luXCIsIHsgY3dkIH0pO1xuICAgICAgaWYgKG9yaWdpbikge1xuICAgICAgICByZXR1cm4gb3JpZ2luO1xuICAgICAgfVxuICAgICAgY29uc3Qgc2x1ZyA9XG4gICAgICAgIGdldEZyb21HaXRDb25maWcoY3dkLCBcImdpdGh1Yi51c2VyXCIpID8/IHJlc29sdmVFbWFpbChjd2QpLnNwbGl0KFwiQFwiKVswXTtcbiAgICAgIHJldHVybiBgaHR0cHM6Ly9naXRodWIuY29tLyR7c2x1Z30vJHtiYXNlZGlyfS5naXRgO1xuXG4gICAgY2FzZSBcIiRHSVRfVVNFUl9OQU1FXCI6XG4gICAgICByZXR1cm4gZ2V0RnJvbUdpdENvbmZpZyhjd2QsIFwidXNlci5uYW1lXCIpID8/IFwidXNlclwiO1xuICAgIGNhc2UgXCIkR0lUX1VTRVJfRU1BSUxcIjpcbiAgICAgIHJldHVybiByZXNvbHZlRW1haWwoY3dkKTtcbiAgICBjYXNlIFwiJFBZVEhPTl9NT0RVTEVfTkFNRVwiOlxuICAgICAgcmV0dXJuIGZvcm1hdEFzUHl0aG9uTW9kdWxlKGJhc2VkaXIpO1xuICB9XG5cbiAgcmV0dXJuIHVuZGVmaW5lZDtcbn1cblxuLyoqXG4gKiBSZXR1cm5zIGEgdmFsdWUgZnJvbSBnaXQgY29uZmlnLiBTZWFyY2hlcyBsb2NhbCBhbmQgdGhlbiBnbG9iYWwgZ2l0IGNvbmZpZy5cbiAqIEBwYXJhbSBrZXkgdGhlIGNvbmZpZyBrZXlcbiAqL1xuZnVuY3Rpb24gZ2V0RnJvbUdpdENvbmZpZyhjd2Q6IHN0cmluZywga2V5OiBzdHJpbmcpOiBzdHJpbmcgfCB1bmRlZmluZWQge1xuICByZXR1cm4gKFxuICAgIGV4ZWNPclVuZGVmaW5lZChgZ2l0IGNvbmZpZyAtLWdldCAtLWluY2x1ZGVzICR7a2V5fWAsIHsgY3dkIH0pID8/XG4gICAgZXhlY09yVW5kZWZpbmVkKGBnaXQgY29uZmlnIC0tZ2V0IC0tZ2xvYmFsIC0taW5jbHVkZXMgJHtrZXl9YCwgeyBjd2QgfSlcbiAgKTtcbn1cblxuZnVuY3Rpb24gcmVzb2x2ZUVtYWlsKGN3ZDogc3RyaW5nKTogc3RyaW5nIHtcbiAgcmV0dXJuIGdldEZyb21HaXRDb25maWcoY3dkLCBcInVzZXIuZW1haWxcIikgPz8gXCJ1c2VyQGRvbWFpbi5jb21cIjtcbn1cbiJdfQ==
|
package/lib/cli/synth.d.ts
CHANGED