@sap/cds-dk 6.2.2 → 6.3.0

package/lib/init/template/helm/subchart/values.schema.json

@@ -351,16 +351,171 @@
         "env": {
             "$id": "#/properties/env",
             "description": "Key-value map of environment variables, which should be added to the Pod spec.",
-            "type": "object",
-            "patternProperties": {
-                "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
-                    "$comment": "regex above copied from https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L402",
-                    "not": {
-                        "type": ["null", "object", "array"]
+            "anyOf": [
+                {
+                    "type": "object",
+                    "patternProperties": {
+                        "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
+                            "$comment": "regex above copied from https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L402",
+                            "anyOf": [
+                                {
+                                    "description": "Plain value of an environment variable.",
+                                    "type": [
+                                        "integer",
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "description": "`valueFrom` configuration for the environment variable https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/",
+                                    "type": "object",
+                                    "additionalProperties": false,
+                                    "maxProperties": 1,
+                                    "properties": {
+                                        "configMapKeyRef": {
+                                            "description": "Selects a key of a ConfigMap.",
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "name": {
+                                                    "description": "Name of a ConfigMap.",
+                                                    "$ref": "#/definitions/KubernetesName"
+                                                },
+                                                "key": {
+                                                    "description": "Key in that ConfigMap, which value will be used.",
+                                                    "type": "string"
+                                                }
+                                            }
+                                        },
+                                        "secretKeyRef": {
+                                            "description": "Selects a key of a Secret.",
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "name": {
+                                                    "description": "Name of a Secret.",
+                                                    "$ref": "#/definitions/KubernetesName"
+                                                },
+                                                "key": {
+                                                    "description": "Key in that Secret, which value will be used.",
+                                                    "type": "string"
+                                                }
+                                            }
+                                        },
+                                        "resourceFieldRef": {
+                                            "description": "Selects a resource of the container.",
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "containerName": {
+                                                    "description": "Name of a Container.",
+                                                    "$ref": "#/definitions/KubernetesName"
+                                                },
+                                                "resource": {
+                                                    "description": "Only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.",
+                                                    "type": "string"
+                                                }
+                                            }
+                                        },
+                                        "fieldRef": {
+                                            "description": "Selects a field of the pod.",
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "fieldPath": {
+                                                    "type": "string",
+                                                    "description": "Supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs."
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "additionalProperties": false,
+                    "default": {}
+                },
+                {
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "maxProperties": 2,
+                        "required": [
+                            "name"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": "string",
+                                "pattern": "^[-._a-zA-Z][-._a-zA-Z0-9]*$"
+                            },
+                            "value": {
+                                "type": [
+                                    "string",
+                                    "integer"
+                                ]
+                            },
+                            "configMapKeyRef": {
+                                "description": "Selects a key of a ConfigMap.",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "name": {
+                                        "description": "Name of a ConfigMap.",
+                                        "$ref": "#/definitions/KubernetesName"
+                                    },
+                                    "key": {
+                                        "description": "Key in that ConfigMap, which value will be used.",
+                                        "type": "string"
+                                    }
+                                }
+                            },
+                            "secretKeyRef": {
+                                "description": "Selects a key of a Secret.",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "name": {
+                                        "description": "Name of a Secret.",
+                                        "$ref": "#/definitions/KubernetesName"
+                                    },
+                                    "key": {
+                                        "description": "Key in that Secret, which value will be used.",
+                                        "type": "string"
+                                    }
+                                }
+                            },
+                            "resourceFieldRef": {
+                                "description": "Selects a resource of the container.",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "containerName": {
+                                        "description": "Name of a Container.",
+                                        "$ref": "#/definitions/KubernetesName"
+                                    },
+                                    "resource": {
+                                        "description": "Only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.",
+                                        "type": "string"
+                                    }
+                                }
+                            },
+                            "fieldRef": {
+                                "description": "Selects a field of the pod.",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "fieldPath": {
+                                        "type": "string",
+                                        "description": "Supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs."
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
-            },
-            "additionalProperties": false,
+            ],
             "default": {}
         },
         "envSecretNames": {

package/lib/init/template/helm/subchart/values.yaml

@@ -55,7 +55,23 @@ envSecretNames: []
 
 env: {}
 # env:
-#   key: value
+#   key1: value
+#   key2:
+#     secretKeyRef:
+#       name: my-secret
+#       key: my-key
+#   key3:
+#     configMapKeyRef:
+#       name: my-configmap
+#       key: my-key
+# Also can be specified as a list
+# env:
+#   - name: key1
+#     value: value1
+#   - name: key2
+#     configMapKeyRef:
+#       name: my-configmap
+#       key: my-key
 
 expose:
   enabled: true

package/lib/init/template/html5-repo/index.js

@@ -1,30 +1,34 @@
 const path = require('path')
-const TemplateBase = require('../templateBase')
+const { exists, copy } = require('../../../cds').utils
 const ProjectReader = require('../../util/projectReader')
-const { srvNode, srvJava, auditlog } = require('../_merging/registry-mta')
+const { mergeYAML } = require('../../util/merge')
 const { OPTION_DESTINATIONS } = require('../../constants')
-const cds = require('../../../cds'), { fs } = cds.utils
 
-module.exports = class Html5RepoTemplate extends TemplateBase {
+module.exports = class Html5RepoTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
     }
 
     async getDependencies() {
         return [OPTION_DESTINATIONS]
     }
 
+    static hasFacet(_, projectPath) {
+        // REVISIT: Should be detectable without helm charts
+        return exists(path.join(projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'))
+    }
+
     async run() {
         await this.runDependentMerging()
     }
 
     async runDependentMerging() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { appName, hasHelmDeployment } = projectDescriptor.cap
+        const { appName, hasHelm } = projectDescriptor.cap
 
-        if (hasHelmDeployment) {
-            await this.templateUtil.mergeYAML(
+        if (hasHelm) {
+            await mergeYAML(
                 path.join(this.projectPath, 'chart', 'values.yaml'),
                 {
                     html5_apps_repo_host: {
@@ -51,9 +55,9 @@ module.exports = class Html5RepoTemplate extends TemplateBase {
                 },
                 null, { forceOverwrite: true }
             )
-            await fs.copy(path.join(__dirname, 'files', '_html5_deployment_helpers.tpl'), path.join(this.projectPath, 'chart', 'templates', '_html5_deployment_helpers.tpl'))
-            await fs.copy(path.join(__dirname, 'files', 'html5-apps-deployer-job.yaml'), path.join(this.projectPath, 'chart', 'templates', 'html5-apps-deployer-job.yaml'))
-            await fs.copy(path.join(__dirname, 'files', 'html5-apps-repo-host.yaml'), path.join(this.projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'))
+            await copy(path.join(__dirname, 'files', '_html5_deployment_helpers.tpl'), path.join(this.projectPath, 'chart', 'templates', '_html5_deployment_helpers.tpl'))
+            await copy(path.join(__dirname, 'files', 'html5-apps-deployer-job.yaml'), path.join(this.projectPath, 'chart', 'templates', 'html5-apps-deployer-job.yaml'))
+            await copy(path.join(__dirname, 'files', 'html5-apps-repo-host.yaml'), path.join(this.projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'))
         }
     }
 }

package/lib/init/template/java/index.js

@@ -5,18 +5,22 @@ const path = require('path');
 const commandUtil = require('../../util/commandUtil');
 const mvnArchetypeUtil = require('../../util/mvnArchetypeUtil');
 const term = require('../../../util/term');
+const cds = require('../../../cds')
+const { exists, copy } = cds.utils
+const LOG = console
 
-const TemplateBase = require('../templateBase');
 const { COMMAND_ADD, URLS, OPTION_JAVA, OPTION_NODEJS } = require('../../constants');
-const { nullLogger } = require('../../util/logger');
 
-
-module.exports = class JavaTemplate extends TemplateBase {
+module.exports = class JavaTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
     }
 
-    async checkEnabled() {
+    static hasFacet(_, projectPath) {
+        return exists(path.join(projectPath, 'pom.xml'))
+    }
+
+    async canRun() {
         if (this.options._cmd === COMMAND_ADD) {
             throw new Error(`You can't change the type of an existing project.`);
         }
@@ -29,18 +33,18 @@ module.exports = class JavaTemplate extends TemplateBase {
     }
 
     async run() {
-        const mvnCmdArgs = mvnArchetypeUtil.getGenerateCmdArgs(this.projectName, this.options, this.logger);
+        const mvnCmdArgs = mvnArchetypeUtil.getGenerateCmdArgs(this.projectName, this.options);
         const { cmdLine, artifactId, archetypeVersion } = mvnCmdArgs
 
-        this.logger.log(`Using Maven archetype version ${archetypeVersion}`);
+        LOG.info(`Using Maven archetype version ${archetypeVersion}`);
 
         const tempFolder = await fs.mkdtemp(path.join(os.tmpdir(), `${this.projectName}_`));
         try {
             await commandUtil.spawnCommand('mvn', cmdLine, {
                 cwd: tempFolder
-            }, (this.logger.isDebug ? this.logger : nullLogger));
+            });
 
-            await this.fsUtil.copy(path.join(tempFolder, artifactId), this.projectPath);
+            await copy(path.join(tempFolder, artifactId), this.projectPath);
         } catch (err) {
             if (err.code === 'ENOENT' && err.path === 'mvn') {
                 throw new Error(`Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`);
@@ -54,9 +58,9 @@ module.exports = class JavaTemplate extends TemplateBase {
     async finalize() {
         const relativeProjectPath = path.relative(this.cwd, this.projectPath);
         if (relativeProjectPath && relativeProjectPath !== '.') {
-            this.logger.log(`Continue with 'cd ${relativeProjectPath}'`);
+            LOG.info(`Continue with 'cd ${relativeProjectPath}'`);
         }
 
-        this.logger.log(`Learn about next steps at ${URLS.CAPIRE}`);
+        LOG.info(`Learn about next steps at ${URLS.CAPIRE}`);
     }
 }

package/lib/init/template/kibana-logging/index.js

@@ -1,34 +1,53 @@
-const cds = require('../../../cds')
 const path = require('path')
-
+const cds = require('../../../cds')
 const ProjectReader = require('../../util/projectReader')
-const TemplateBase = require('../templateBase')
+const { mergeJSON, mergeYAML } = require('../../util/merge')
 const { PROJECT_TYPE, } = require('../../constants')
 const { srvNode, srvJava, kibanaLogging } = require('../_merging/registry-mta')
 
-module.exports = class KibanaTemplate extends TemplateBase {
+module.exports = class KibanaTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
     }
 
-    async checkEnabled() {
+    async canRun() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { hasMtaDeployment, hasHelmDeployment } = projectDescriptor.cap
-        if (hasHelmDeployment && !hasMtaDeployment) {
+        const { hasMta, hasHelm } = projectDescriptor.cap
+        if (hasHelm && !hasMta) {
             throw `'cds add kibana-logging' is not available for Kyma yet`
         }
     }
 
+    async run() {
+        const projectType = await this.getProjectType()
+
+        switch (projectType) {
+            case PROJECT_TYPE.java:
+            default:
+                cds.error(`kibana-logging is not implemented for project type '${projectType}' yet`)
+                // TODO: implement
+                break
+            case PROJECT_TYPE.nodejs: {
+                const projectDescriptor = await this.projectReader.read(this.options);
+                const { for: forProfile } = projectDescriptor.cap
+                const cdsTemplateFile = forProfile ? 'cds.profile.package.json.hbs' : 'cds.package.json'
+                const cdsTemplatePath = path.join(__dirname, 'files', cdsTemplateFile)
+                await mergeJSON(path.join(this.projectPath, 'package.json'), cdsTemplatePath, projectDescriptor)
+            }
+        }
+        await this.runDependentMerging()
+    }
+
     async runDependentMerging() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { hasMtaDeployment, isNodejs } = projectDescriptor.cap
+        const { hasMta, isNodejs } = projectDescriptor.cap
 
-        if (hasMtaDeployment) {
+        if (hasMta) {
             const srv = isNodejs ? srvNode : srvJava
 
             const mtaYAMLPath = path.join(this.projectPath, 'mta.yaml')
-            await this.templateUtil.mergeYAML(
+            await mergeYAML(
                 mtaYAMLPath,
                 `${__dirname}/files/mta.yaml.hbs`,
                 projectDescriptor,
@@ -42,24 +61,4 @@ module.exports = class KibanaTemplate extends TemplateBase {
             )
         }
     }
-
-    async run() {
-        const projectType = await this.getProjectType()
-
-        switch (projectType) {
-            case PROJECT_TYPE.java:
-            default:
-                cds.error(`kibana-logging is not implemented for project type '${projectType}' yet`)
-                // TODO: implement
-                break
-            case PROJECT_TYPE.nodejs: {
-                const projectDescriptor = await this.projectReader.read(this.options);
-                const { for: forProfile } = projectDescriptor.cap
-                const cdsTemplateFile = forProfile ? 'cds.profile.package.json.hbs' : 'cds.package.json'
-                const cdsTemplatePath = path.join(__dirname, 'files', cdsTemplateFile)
-                await this.templateUtil.mergeJSON(path.join(this.projectPath, 'package.json'), cdsTemplatePath, projectDescriptor)
-            }
-        }
-        await this.runDependentMerging()
-    }
 }

package/lib/init/template/lint/index.js

@@ -1,15 +1,16 @@
 const os = require("os");
 const path = require("path");
 const cp = require("child_process");
-const TemplateBase = require("../templateBase");
 const term = require("../../../util/term");
 const checks = require("../../../lint/checks");
 const io = require("../../../lint/io");
 const readline = require("readline");
-
+const { copyFiles } = require('../../util/templateUtil')
 const { OPTION_LINT_DEV, OPTION_LINT_GLOBAL } = require("../../constants");
-const { mkdirp, fs } = require("../../../cds").utils;
 const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
+const cds = require("../../../cds");
+const { mkdirp, exists } = cds.utils;
+const LOG = console;
 
 const IS_WIN = os.platform() === "win32";
 const ALLOWED_FILE_EXTENSIONS = getFileExtensions();
@@ -17,7 +18,7 @@ const VSCODE_FILE_ASSOCIATIONS = {
   "csv": [ "csv", "csv (semicolon)", "tsv", "tab" ]
 }
 
-module.exports = class LintTemplate extends TemplateBase {
+module.exports = class LintTemplate extends require('../templateBase') {
   constructor(projectPath, generator) {
     super(projectPath, generator, __dirname);
     this.projectPath = projectPath;
@@ -31,7 +32,7 @@ module.exports = class LintTemplate extends TemplateBase {
     this.isTest = false;
   }
 
-  async checkEnabled() {
+  async canRun() {
     if (this.options.lint) {
       // If custom rule example is requested, also trigger
       // "custom" rule type of setup
@@ -61,10 +62,10 @@ module.exports = class LintTemplate extends TemplateBase {
         // Generate custom lint rules dirs
         await this._generateEslintDirs();
 
-        if (!fs.existsSync(".eslint/rules/no-entity-moo.js")) {
+        if (!exists(".eslint/rules/no-entity-moo.js")) {
           await this._copyFromTemplate(".eslint/rules", this.rulesPath);
         }
-        if (!fs.existsSync(".eslint/tests/no-entity-moo.test.js")) {
+        if (!exists(".eslint/tests/no-entity-moo.test.js")) {
           await this._copyFromTemplate(".eslint/tests", this.testsPath);
         }
       }
@@ -99,20 +100,20 @@ module.exports = class LintTemplate extends TemplateBase {
         ].join(" ")}`;
 
         if (this.options.force) {
-          this.logger.log(
+          LOG.info(
             `\n\nAlmost done - installing ${this.missingNpmDependencies["names"].length} npm dependencies:\n${task}`
           );
           this._runTask(task);
         } else {
-          this.logger.log(
+          LOG.info(
             `\n\nAlmost done - ${term.warn(
               `you are missing ${this.missingNpmDependencies["names"].length} npm dependencies`
             )}:\n`
           );
           this.missingNpmDependencies["msgs"].forEach((msg, i) => {
-            this.logger.log(`(${i + 1}) ${msg}`);
+            LOG.info(`(${i + 1}) ${msg}`);
             if (i === this.missingNpmDependencies["msgs"].length - 1) {
-              this.logger.log("\n");
+              LOG.info("\n");
             }
           });
           await this._promptInstallDependencies(task);
@@ -148,20 +149,18 @@ module.exports = class LintTemplate extends TemplateBase {
     await mkdirp(this.docsPath);
     await mkdirp(this.rulesPath);
     await mkdirp(this.testsPath);
-    return;
   }
 
   async _copyFromTemplate(source, dest) {
-    await this.templateUtil.copyFiles(source, dest, {}, true);
-    return;
+    await copyFiles(source, dest, {}, true);
   }
 
   async _addEslintPluginConfig() {
-    let configPath = getConfigPath(this.projectPath, this.logger);
+    let configPath = getConfigPath(this.projectPath);
     if (!configPath) {
       configPath = path.join(this.projectPath, ".eslintrc");
     }
-    await io.sanitizeEslintConfig(configPath, this.customRuleExample, this.logger);
+    await io.sanitizeEslintConfig(configPath, this.customRuleExample);
     return;
   }
 
@@ -178,7 +177,7 @@ module.exports = class LintTemplate extends TemplateBase {
     const timerID = setTimeout(() => {
       rl.write("no" + os.EOL);
     }, 10000);
-    // Ask user whether dependences should be installed
+    // Ask user whether dependencies should be installed
     const question = `${term.warn("Install dependencies now")} ? [y/n] `;
     let todos = `${term.error(
       "Aborted!\nPlease install the following components manually:"
@@ -193,7 +192,7 @@ module.exports = class LintTemplate extends TemplateBase {
           resolve(this._runTask(task));
           // If use declines or question timeout is reached, print todos
         } else if (["n", "no"].includes(received.toLowerCase())) {
-          this.logger.log(todos);
+          LOG.info(todos);
           resolve();
         } else {
           // Close and restart question (with new timeout)

package/lib/init/template/mta/index.js

@@ -1,53 +1,31 @@
-const { existsSync } = require('fs');
 const { join } = require('path');
-const TemplateBase = require('../templateBase');
+const { exists, path } = require('../../../cds').utils
+const { copyFiles } = require('../../util/templateUtil')
 const ProjectReader = require('../../util/projectReader');
 
-module.exports = class MtaTemplate extends TemplateBase {
+module.exports = class MtaTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
-        this.projectReader = new ProjectReader(this);
+        this.projectReader = new ProjectReader(projectPath);
+    }
+
+    static hasFacet(_, projectPath, options) {
+        if (!options?.add.has('mta') && options?.add.has('helm')) return false
+        return exists(join(projectPath, 'mta.yaml'))
     }
 
     async run() {
-        const projectDescriptor = await this.projectReader.read();
-        const { hasApprouter, hasHana, hasXsuaa, isMultitenant, isExtensible, hasMessaging } = projectDescriptor.cap;
-        if (!existsSync(join(this.projectPath, 'mta.yaml'))) {
-            await this.templateUtil.copyFiles('.', this.projectPath, projectDescriptor);
+        const projectDescriptor = await this.projectReader.read()
+        if (!exists(join(this.projectPath, 'mta.yaml'))) {
+            await copyFiles(path.join(__dirname, 'files'), this.projectPath, projectDescriptor);
         }
 
-        // Re-applying the merging part of `cds add xsuaa`, `cds add hana`, and `cds add mtx`, if necessary.
-        // TODO: Find a generic solution for situation like these. Probably involves some restructuring in the
-        // project reader, so that there's a logical mapping from hasX to XTemplate.
-        if (hasApprouter) {
-            const ApprouterTemplate = require(`../approuter`)
-            const template = new ApprouterTemplate(this.projectPath, this.generator)
-            await template.runDependentMerging()
-        }
-        if (hasHana) {
-            const HanaTemplate = require(`../hana`)
-            const template = new HanaTemplate(this.projectPath, this.generator)
-            await template.runDependentMerging()
-        }
-        if (hasXsuaa) {
-            const XsuaaTemplate = require(`../xsuaa`)
-            const template = new XsuaaTemplate(this.projectPath, this.generator)
-            await template.runDependentMerging()
-        }
-        if (isMultitenant) {
-            const MultitenancyTemplate = require(`../multitenancy`)
-            const template = new MultitenancyTemplate(this.projectPath, this.generator)
-            await template.runDependentMerging()
-        }
-        if (isExtensible) {
-            const ExtensibilityTemplate = require(`../extensibility`)
-            const template = new ExtensibilityTemplate(this.projectPath, this.generator)
-            await template.runDependentMerging()
-        }
-        if (hasMessaging) {
-            const EnterpriseMessagingTemplate = require(`../enterprise-messaging`)
-            const template = new EnterpriseMessagingTemplate(this.projectPath, this.generator)
-            await template.runDependentMerging()
+        // Re-applying the dependent merging part of other facets if necessary.
+        const dependentFacets = ['approuter', 'hana', 'xsuaa', 'multitenancy', 'extensibility', 'enterprise-messaging']
+        for (const facet of dependentFacets) {
+            const Template = require('../'+facet)
+            const template = new Template(this.projectPath, this.generator)
+            if (Template.hasFacet(await this.getEnv(), this.projectPath, this.options)) await template.runDependentMerging()
         }
     }
 }

package/lib/init/template/mtx/index.js

@@ -1,11 +1,10 @@
-const TemplateBase = require('../templateBase')
 const ProjectReader = require('../../util/projectReader')
 const { OPTION_MULTITENANCY, OPTION_TOGGLES, OPTION_EXTENSIBILITY } = require('../../constants')
 
-module.exports = class MtxTemplate extends TemplateBase {
+module.exports = class MtxTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
     }
 
     async getDependencies() {