@sap/cds-dk 7.0.0 → 7.0.2

package/lib/init/template/sample/files/app/common.cds

@@ -10,16 +10,16 @@ using { sap.common, sap.common.Currencies } from '@sap/cds/common';
 //	Books Lists
 //
 annotate my.Books with @(
-  Common.SemanticKey : [ID],
-  UI                 : {
-    Identification  : [{ Value: title }],
-    SelectionFields : [
+  Common.SemanticKey: [ID],
+  UI: {
+    Identification: [{ Value: title }],
+    SelectionFields: [
       ID,
       author_ID,
       price,
       currency_code
     ],
-    LineItem        : [
+    LineItem: [
       { Value: ID, Label: '{i18n>Title}' },
       { Value: author.ID, Label: '{i18n>Author}' },
       { Value: genre.name },
@@ -29,16 +29,16 @@ annotate my.Books with @(
     ]
   }
 ) {
-  ID  @Common: {
-    SemanticObject : 'Books',
+  ID @Common: {
+    SemanticObject: 'Books',
     Text: title,
-    TextArrangement : #TextOnly
+    TextArrangement: #TextOnly
   };
-  author @ValueList.entity      : 'Authors';
+  author @ValueList.entity: 'Authors';
 };
 
 annotate Currencies with {
-  symbol @Common.Label : '{i18n>Currency}';
+  symbol @Common.Label: '{i18n>Currency}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -46,10 +46,10 @@ annotate Currencies with {
 //	Books Details
 //
 annotate my.Books with @(UI : {HeaderInfo : {
-  TypeName       : '{i18n>Book}',
-  TypeNamePlural : '{i18n>Books}',
-  Title          : { Value: title },
-  Description    : { Value: author.name }
+  TypeName      : '{i18n>Book}',
+  TypeNamePlural: '{i18n>Books}',
+  Title         : { Value: title },
+  Description   : { Value: author.name }
 }, });
 
 
@@ -62,9 +62,9 @@ annotate my.Books with {
   title  @title: '{i18n>Title}';
   genre  @title: '{i18n>Genre}'   @Common: { Text: genre.name, TextArrangement: #TextOnly };
   author @title: '{i18n>Author}'  @Common: { Text: author.name, TextArrangement: #TextOnly };
-  price  @title: '{i18n>Price}'   @Measures.ISOCurrency : currency_code;
+  price  @title: '{i18n>Price}'   @Measures.ISOCurrency: currency_code;
   stock  @title: '{i18n>Stock}';
-  descr  @title: '{i18n>Description}'  @UI.MultiLineText;
+  descr  @title: '{i18n>Description}' @UI.MultiLineText;
   image  @title: '{i18n>Image}';
 }
 
@@ -73,13 +73,13 @@ annotate my.Books with {
 //	Genres List
 //
 annotate my.Genres with @(
-  Common.SemanticKey : [name],
-  UI                 : {
-    SelectionFields : [name],
-    LineItem        : [
+  Common.SemanticKey: [name],
+  UI: {
+    SelectionFields: [name],
+    LineItem: [
       { Value: name },
       {
-        Value : parent.name,
+        Value: parent.name,
         Label: 'Main Genre'
       },
     ],
@@ -95,17 +95,17 @@ annotate my.Genres with {
 //	Genre Details
 //
 annotate my.Genres with @(UI : {
-  Identification : [{ Value: name}],
-  HeaderInfo     : {
-    TypeName       : '{i18n>Genre}',
-    TypeNamePlural : '{i18n>Genres}',
-    Title          : { Value: name },
-    Description    : { Value: ID }
+  Identification: [{ Value: name}],
+  HeaderInfo: {
+    TypeName      : '{i18n>Genre}',
+    TypeNamePlural: '{i18n>Genres}',
+    Title         : { Value: name },
+    Description   : { Value: ID }
   },
-  Facets         : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : '{i18n>SubGenres}',
-    Target : 'children/@UI.LineItem'
+  Facets: [{
+    $Type : 'UI.ReferenceFacet',
+    Label : '{i18n>SubGenres}',
+    Target: 'children/@UI.LineItem'
   }, ],
 });
 
@@ -123,11 +123,11 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-  Common.SemanticKey : [ID],
-  UI                 : {
-    Identification  : [{ Value: name}],
-    SelectionFields : [name],
-    LineItem        : [
+  Common.SemanticKey: [ID],
+  UI: {
+    Identification : [{ Value: name}],
+    SelectionFields: [ name ],
+    LineItem       : [
       { Value: ID },
       { Value: dateOfBirth },
       { Value: dateOfDeath },
@@ -136,10 +136,10 @@ annotate my.Authors with @(
     ],
   }
 ) {
-  ID  @Common: {
-    SemanticObject : 'Authors',
+  ID @Common: {
+    SemanticObject: 'Authors',
     Text: name,
-    TextArrangement : #TextOnly,
+    TextArrangement: #TextOnly,
   };
 };
 
@@ -148,16 +148,16 @@ annotate my.Authors with @(
 //	Author Details
 //
 annotate my.Authors with @(UI : {
-  HeaderInfo : {
-    TypeName       : '{i18n>Author}',
-    TypeNamePlural : '{i18n>Authors}',
-    Title          : { Value: name },
-    Description    : { Value: dateOfBirth }
+  HeaderInfo: {
+    TypeName      : '{i18n>Author}',
+    TypeNamePlural: '{i18n>Authors}',
+    Title         : { Value: name },
+    Description   : { Value: dateOfBirth }
   },
-  Facets     : [{
-    $Type  : 'UI.ReferenceFacet',
-    Target : 'books/@UI.LineItem'
-  }, ],
+  Facets: [{
+    $Type : 'UI.ReferenceFacet',
+    Target: 'books/@UI.LineItem'
+  }],
 });
 
 
@@ -179,14 +179,11 @@ annotate my.Authors with {
 //	Languages List
 //
 annotate common.Languages with @(
-  Common.SemanticKey : [code],
-  Identification     : [{ Value: code}],
-  UI                 : {
-    SelectionFields : [
-      name,
-      descr
-    ],
-    LineItem        : [
+  Common.SemanticKey: [code],
+  Identification: [{ Value: code }],
+  UI: {
+    SelectionFields: [ name, descr ],
+    LineItem: [
       { Value: code },
       { Value: name },
     ],
@@ -198,18 +195,18 @@ annotate common.Languages with @(
 //	Language Details
 //
 annotate common.Languages with @(UI : {
-  HeaderInfo          : {
-    TypeName       : '{i18n>Language}',
-    TypeNamePlural : '{i18n>Languages}',
-    Title          : { Value: name },
-    Description    : { Value: descr }
+  HeaderInfo: {
+    TypeName      : '{i18n>Language}',
+    TypeNamePlural: '{i18n>Languages}',
+    Title         : { Value: name },
+    Description   : { Value: descr }
   },
-  Facets              : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : '{i18n>Details}',
-    Target : '@UI.FieldGroup#Details'
+  Facets: [{
+    $Type : 'UI.ReferenceFacet',
+    Label : '{i18n>Details}',
+    Target: '@UI.FieldGroup#Details'
   }, ],
-  FieldGroup #Details : {Data : [
+  FieldGroup #Details: {Data : [
     { Value: code },
     { Value: name },
     { Value: descr }
@@ -221,14 +218,14 @@ annotate common.Languages with @(UI : {
 //	Currencies List
 //
 annotate common.Currencies with @(
-  Common.SemanticKey : [code],
-  Identification     : [{ Value: code}],
-  UI                 : {
-    SelectionFields : [
+  Common.SemanticKey: [code],
+  Identification: [{ Value: code}],
+  UI: {
+    SelectionFields: [
       name,
       descr
     ],
-    LineItem        : [
+    LineItem: [
       { Value: descr },
       { Value: symbol },
       { Value: code },
@@ -241,20 +238,20 @@ annotate common.Currencies with @(
 //	Currency Details
 //
 annotate common.Currencies with @(UI : {
-  HeaderInfo           : {
-    TypeName       : '{i18n>Currency}',
-    TypeNamePlural : '{i18n>Currencies}',
-    Title          : { Value: descr },
-    Description    : { Value: code }
+  HeaderInfo: {
+    TypeName      : '{i18n>Currency}',
+    TypeNamePlural: '{i18n>Currencies}',
+    Title         : { Value: descr },
+    Description   : { Value: code }
   },
-  Facets               : [
+  Facets: [
     {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Details}',
-      Target : '@UI.FieldGroup#Details'
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Details}',
+      Target: '@UI.FieldGroup#Details'
     }
   ],
-  FieldGroup #Details  : {Data : [
+  FieldGroup #Details: {Data : [
     { Value: name },
     { Value: symbol },
     { Value: code },

package/lib/init/template/sample/files/app/services.cds

@@ -2,4 +2,5 @@
   This model controls what gets served to Fiori frontends...
 */
 using from './common';
+using from './browse/fiori-service';
 using from './admin-books/fiori-service';

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

@@ -1,9 +1,9 @@
 const term = require('../../../util/term')
-const {  SAMPLE_TINY } = require('../../constants').OPTIONS
+const { TINY_SAMPLE } = require('../../constants').OPTIONS
 
 module.exports = class SamplesTemplate extends require('../templateBase') {
     getDependencies() {
-        console.warn(term.warn(`'cds add samples' is deprecated and will be removed in future versions. Please use 'cds add sample-tiny' instead.\n`))
-        return [SAMPLE_TINY]
+        console.warn(term.warn(`'cds add samples' is deprecated and will be removed in future versions. Please use 'cds add tiny-sample' instead.\n`))
+        return [TINY_SAMPLE]
     }
 }

package/lib/init/template/sqlite/files/package.json.hbs

@@ -1,27 +1,7 @@
 {
   {{#isNodejs}}
   "devDependencies": {
-    "sqlite3": "^5"
-  },
-  "cds": {
-  {{/isNodejs}}
-    "requires": {
-      {{#profile}}
-      "[{{profile}}]": {
-      {{/profile}}
-      {{#shortcut}}
-        "db": "sqlite"
-      {{/shortcut}}
-      {{^shortcut}}
-        "db": {
-          "kind": "sqlite"
-        }
-      {{/shortcut}}
-      {{#profile}}
-      }
-      {{/profile}}
-    }
-  {{#isNodejs}}
+    "@cap-js/sqlite": "^1"
   }
   {{/isNodejs}}
 }

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

@@ -7,9 +7,9 @@ const { mergeJSON } = require('../../util/merge')
 module.exports = class SQLiteTemplate extends require('../templateBase') {
 
     async run() {
-      const projectDescriptor = await readProject(this.options)
-      const { configFile } = projectDescriptor
-      projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
-      await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
+      const project = await readProject(this.options)
+      const { configFile } = project
+      project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+      await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
     }
 }

package/lib/init/template/templateBase.js

@@ -10,7 +10,7 @@ module.exports = class TemplateBase {
      */
     constructor(generator) {
         if (generator.options?.for && typeof generator.options?.for !== 'string') {
-            throw new Error('The --for argument must not be empty.')
+            throw 'The --for argument must not be empty.'
         }
         this.projectPath = cds.root;
         this.options = generator.options || {};

package/lib/init/template/{sample-tiny → tiny-sample}/files/nodejs/db/data-model.cds

@@ -4,4 +4,4 @@ entity Books {
   key ID : Integer;
   title  : String;
   stock  : Integer;
-}
+}

package/lib/init/template/{sample-tiny → tiny-sample}/files/nodejs/srv/cat-service.cds.hbs

@@ -2,4 +2,4 @@ using my.bookshop as my from '../{{ dbFolder }}/data-model';
 
 service CatalogService {
     @readonly entity Books as projection on my.Books;
-}
+}

package/lib/init/template/{sample-tiny → tiny-sample}/index.js

@@ -6,7 +6,7 @@ const mvnArchetypes = require('../../util/mvn')
 const term = require('../../../util/term')
 const { PROJECT_TYPE: { java, nodejs }, OPTIONS: { JAVA }, URLS } = require('../../constants')
 
-module.exports = class SampleTinyTemplate extends require('../templateBase') {
+module.exports = class TinySampleTemplate extends require('../templateBase') {
 
     async run() {
         switch (this.getProjectType()) {
@@ -24,7 +24,7 @@ module.exports = class SampleTinyTemplate extends require('../templateBase') {
                 await commandUtil.spawnCommand('mvn', mvnAddTestsArgs, { cwd: cds.root })
             } 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.`)
+                    throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
                 }
                 throw err
             }

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

@@ -9,9 +9,9 @@ module.exports = class TogglesTemplate extends require('../templateBase') {
   }
 
   async run() {
-    const projectDescriptor = await readProject(this.options)
-    const { isNodejs , configFile} = projectDescriptor
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+    const project = await readProject(this.options)
+    const { isNodejs , configFile} = project
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
     if (isNodejs) await sort('package.json', 'dependencies')
     await this.runDependentMerging()
   }

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

@@ -1,14 +1,15 @@
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeGitignore } = require('../../util/merge')
+const { warn, secondary } = require('../../../util/term')
 const { TYPER } = require('../../constants').OPTIONS
 const { exists, read } = require('../../../cds').utils
 
 module.exports = class TyperTemplate extends require('../templateBase') {
   async canRun() {
-    const projectDescriptor = await readProject(this.options)
-    if (projectDescriptor.isJava) {
-      console.warn(`WARNING: This appears to be a Java project. ${TYPER} facet is intended to be used in Node.js projects. Proceeding anyway`)
+    const { isJava } = await readProject(this.options)
+    if (isJava) {
+      console.warn(warn(`This appears to be a Java project. 'cds add ${TYPER}' is intended to be used in Node.js projects. Proceeding anyway.\n`))
     }
     return true
   }
@@ -24,13 +25,13 @@ module.exports = class TyperTemplate extends require('../templateBase') {
     }
     await mergeJSON('package.json', template('package.json'))
     await mergeGitignore('.gitignore', template('gitignore'))
-    console.info('INFO: Adding this facet changed your .gitignore file to ignore generated types')
+    console.log(secondary(` > Adding '@cds-models' to .gitignore to ignore generated types`)) // REVISIT: other facets are silent wrt. what they change
     try {
       await mergeJSON(target, source)
     } catch (e) {
       throw e instanceof SyntaxError
         ? `SyntaxError in ${target}. This could indicate a JSON file with comments, which is not supported at this time. Remove all comments from ${target} and rerun or add the following entries manually:\n${JSON.stringify(source, null, 2)}`
         : e
-    }    
+    }
   }
 }

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

@@ -17,16 +17,16 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectDescriptor = await readProject(this.options)
-        const { configFile } = projectDescriptor
-        projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.auth?.kind
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor, { forceOverwrite: true })
+        const project = await readProject(this.options)
+        const { configFile } = project
+        project.shortcut = !(await read(configFile)).cds?.requires?.auth?.kind
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project, { forceOverwrite: true })
         await this.runDependentMerging()
     }
 
     async runDependentMerging( context = {}) {
-        const projectDescriptor = await readProject(this.options)
-        const { isMultitenant, hasMta, hasHelm, isJava, srvPath } = projectDescriptor
+        const project = await readProject(this.options)
+        const { isMultitenant, hasMta, hasHelm, isJava, srvPath } = project
 
         const cds = require('../../../../lib')
         const xsSecurity = await (async () => { try {
@@ -41,7 +41,7 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
                 isEqualTo: scope.name
             }],
         }))}
-        await mergeJSON('xs-security.json', xsSecurity, projectDescriptor, mergingSemantics)
+        await mergeJSON('xs-security.json', xsSecurity, project, mergingSemantics)
 
         if (hasMta) {
             const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
@@ -58,7 +58,7 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
                 into: [mtxSidecar, 'requires', 'name']
             })
 
-            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), projectDescriptor, { additions, relationships })
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, { additions, relationships })
         }
 
         if (hasHelm) {
@@ -80,7 +80,7 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
             await mergeYAML(
                 join('chart', 'values.yaml'),
                 join(__dirname, 'files', 'values.yaml.hbs'),
-                projectDescriptor
+                project
             )
             if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }

package/lib/init/util/md5.js

@@ -6,7 +6,7 @@ const crypto = require('crypto');
 const os = require('os');
 const { copyRenderedYAML } = require('../../util/fs');
 
-async function copyAndTrack(source, dest, context = {}, { force = false, projectDescriptor } = {}) {
+async function copyAndTrack(source, dest, context = {}, { force = false, project } = {}) {
     await mkdirp(dirname(dest));
     if (isdir(source)) {
         const dirents = await readdir(source);
@@ -17,7 +17,7 @@ async function copyAndTrack(source, dest, context = {}, { force = false, project
             console.log('Chart file ' + dest + ' has been modified and will not be updated.');
         } else {
             _track(dest, data, context);
-            if (projectDescriptor) return copyRenderedYAML(source, dest, projectDescriptor)
+            if (project) return copyRenderedYAML(source, dest, project)
             return copy(source).to(dest);
         }
     }

package/lib/init/util/merge.js

@@ -38,23 +38,23 @@ async function sort(path, key) {
 /**
  * @param {string} into - file path to merge into
  * @param {string | string[]} from - either path to file (string) or lines from source gitignore (string[])
- * @returns {string[]} the lines of the updated .gitignore
+ * @returns {Promise<string[]>} the lines of the updated .gitignore
  */
 async function mergeGitignore (into, from) {
     const source = typeof from === 'string' ? (await read(from)).split(EOL) : from
-  
+
     if (typeof into === 'string' && !exists(into)) {
       return write(into, source.join(EOL))
     }
-  
+
     const target = (await read(into)).split(EOL)
     const enhanced = target.concat(source.filter(line => !target.includes(line)))
     await write(into, enhanced.join(EOL))
     return enhanced
   }
 
-async function mergeJSON(into, from, projectDescriptor, semantics) {
-    const source = typeof from === 'string' ? await readJSON(from, projectDescriptor) : from
+async function mergeJSON(into, from, project, semantics) {
+    const source = typeof from === 'string' ? await readJSON(from, project) : from
 
     if (typeof into === 'string' && !exists(into)) {
         return write(into, source, { spaces: 2 })
@@ -65,7 +65,7 @@ async function mergeJSON(into, from, projectDescriptor, semantics) {
         const target = await read(into)
         const targetYAML = YAML.parseDocument(YAML.stringify(target))
         const sourceYAML = YAML.parseDocument(YAML.stringify(source))
-        const resultYAML = await mergeYAML(targetYAML, sourceYAML, projectDescriptor, semantics)
+        const resultYAML = await mergeYAML(targetYAML, sourceYAML, project, semantics)
         result = YAML.parse(YAML.stringify(resultYAML))
     } else {
         const target = typeof into === 'string' ? await read(into) : into
@@ -75,13 +75,13 @@ async function mergeJSON(into, from, projectDescriptor, semantics) {
     return result
 }
 
-async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
+async function mergeYAML(into, from, project, semantics = {}) {
     const target = typeof into === 'string' ? await readYAML(into) : into instanceof YAML.Document ? into : new YAML.Document(into)
-    const source = typeof from === 'string' ? await readYAML(from, projectDescriptor) : from instanceof YAML.Document ? from : new YAML.Document(from)
+    const source = typeof from === 'string' ? await readYAML(from, project) : from instanceof YAML.Document ? from : new YAML.Document(from)
 
     if (!target || !target.contents) {
         if (typeof into === 'string' && typeof from === 'string') {
-            return projectDescriptor ? writeYAML(into, source) : copy(from, into)
+            return project ? writeYAML(into, source) : copy(from, into)
         }
         return /* has no YAML */
     }

package/lib/init/util/mvn.js

@@ -164,7 +164,7 @@ class MvnArchetypeUtil {
         if (packageFromParam) {
             // explicitly specified, so do not modify
             if (!options.force && !packageFromParam.match(REGEX_JAVA_PACKAGE)) {
-                throw new Error(`Package '${packageFromParam}' is an invalid Java package name. Use --force to use it anyway.`);
+                throw `Package '${packageFromParam}' is an invalid Java package name. Use --force to use it anyway.`
             }
         } else {
             // potentially overwritten by mvn param

package/lib/init/util/projectReader.js

@@ -43,8 +43,8 @@ module.exports = new class ProjectReader {
             get hasRequires()    { return this.requires.length > 0 },
             get needsSidecar()   { return (options?.add.has('hana') || this.db.length > 0) && (this.isJava || !this.isMultitenant) },
             get configFile()     { return exists('pom.xml') ? '.cdsrc.json' : 'package.json' },
-            get isNodejs()       { return this.language === P_LANGUAGE_NODEJS },
-            get isJava()         { return this.language === P_LANGUAGE_JAVA },
+            get isNodejs()       { return _hasFacet('nodejs') },
+            get isJava()         { return _hasFacet('java') },
             get hasSidecar()     { return exists('mtx', 'sidecar') },
             get isMultitenant()  { return _hasFacet('multitenancy') },
             get isExtensible()   { return _hasFacet('extensibility') },
@@ -56,7 +56,7 @@ module.exports = new class ProjectReader {
             get hasHtml5Repo()   { return _hasFacet('html5-repo') },
             get hasMta()         { return _hasFacet('mta') },
             get hasHelm()        { return _hasFacet('helm') },
-            get appPath()        { return env.folders.app },
+            get appPath()        { return env.folders.app ?? 'app' },
         }
 
         // setting the effective env as it might have changed by already executed 'add' commands, e.g. cds init foo --add hana,mta
@@ -102,7 +102,7 @@ module.exports = new class ProjectReader {
             const dependencies = pom?.dependencies?.[0]?.dependency
             const isOldJavaRuntime = [...dependencies].some(d => /com\.sap\.cloud\.servicesdk/.test(d?.groupId?.[0]))
             if (isOldJavaRuntime) {
-                throw new Error("Projects using the classic CAP Java SDK are not supported")
+                throw "Projects using the classic CAP Java SDK are not supported"
             }
 
             const descriptor = { archiveName: path.basename(cds.root) + "-exec.jar" }

package/lib/util/fs.js

@@ -11,7 +11,7 @@ module.exports = new class FsUtil {
         this.copyRenderedYAML = this.copyRenderedYAML.bind(this)
     }
 
-    async readYAML(src, projectDescriptor) {
+    async readYAML(src, project) {
         let file
         try {
             file = await read(src, 'utf8')
@@ -19,9 +19,9 @@ module.exports = new class FsUtil {
             if (e.code === 'ENOENT') return undefined
             throw e
         }
-        if (projectDescriptor) {
+        if (project) {
             const Mustache = require('mustache')
-            const renderedFile = Mustache.render(file, projectDescriptor)
+            const renderedFile = Mustache.render(file, project)
             return YAML.parseDocument(renderedFile)
         }
         return YAML.parseDocument(file)
@@ -32,16 +32,16 @@ module.exports = new class FsUtil {
         await write(content).to(dst)
     }
 
-    async copyRenderedYAML(src, dst, projectDescriptor) {
-        const yaml = await this.readYAML(src, projectDescriptor)
+    async copyRenderedYAML(src, dst, project) {
+        const yaml = await this.readYAML(src, project)
         await write(yaml.toString()).to(dst)
     }
 
-    async readJSON(src, projectDescriptor) {
+    async readJSON(src, project) {
         const file = await read(src, 'utf8')
-        if (projectDescriptor) {
+        if (project) {
             const Mustache = require('mustache')
-            const renderedFile = Mustache.render(file, projectDescriptor)
+            const renderedFile = Mustache.render(file, project)
             return JSON.parse(renderedFile)
         }
         return JSON.parse(file)
@@ -51,8 +51,8 @@ module.exports = new class FsUtil {
         return JSONC.parse(await read(src, 'utf8'))
     }
 
-    async copyRenderedJSON(src, dst, projectDescriptor) {
-        const json = await this.readJSON(src, projectDescriptor)
+    async copyRenderedJSON(src, dst, project) {
+        const json = await this.readJSON(src, project)
         await write(dst, json, { spaces: 2 })
     }
 }