@sap/cds-compiler 3.4.2 → 3.5.0

package/lib/api/main.js

@@ -12,11 +12,12 @@ const forOdataNew = lazyload('../transform/forOdataNew.js');
 const toSql = lazyload('../render/toSql');
 const toCdl = require('../render/toCdl');
 const modelCompare = lazyload('../modelCompare/compare');
-const diffFilter = lazyload('../modelCompare/filter');
+const diffFilter = lazyload('../modelCompare/utils/filter');
 const sortViews = lazyload('../model/sortViews');
 const csnUtils = lazyload('../model/csnUtils');
 const timetrace = lazyload('../utils/timetrace');
 const forRelationalDB = lazyload('../transform/forRelationalDB');
+const sqlUtils = lazyload('../render/utils/sql');
 
 /**
  * Return the artifact name for use for the hdbresult object
@@ -26,15 +27,14 @@ const forRelationalDB = lazyload('../transform/forRelationalDB');
  * @param {CSN.Model} csn SQL transformed model
  * @returns {string} Name with . replaced as _ in some places
  */
-function getFileName(artifactName, csn) {
+function getFileName( artifactName, csn ) {
   return csnUtils.getResultingName(csn, 'quoted', artifactName);
 }
 
-const { cloneCsnNonDict } = require('../model/csnUtils');
 const { toHdbcdsSource } = require('../render/toHdbcds');
 const { ModelError } = require('../base/error');
 const { forEach, forEachKey } = require('../utils/objectUtils');
-const { checkRemovedDeprecatedFlags, isBetaEnabled } = require('../base/model');
+const { checkRemovedDeprecatedFlags } = require('../base/model');
 const { csn2edm, csn2edmAll } = require('../edm/csn2edm');
 
 const relevantGeneralOptions = [ /* for future generic options */ ];
@@ -50,8 +50,8 @@ const warnAboutMismatchOdata = [ 'odataVersion' ];
  * @param {string[]} relevantOptionNames Option names that are defining characteristics
  * @param {string[]} [optionalOptionNames=[]] Option names that should be attached as a fyi
  */
-function attachTransformerCharacteristics(csn, transformation, options,
-                                          relevantOptionNames, optionalOptionNames = []) {
+function attachTransformerCharacteristics( csn, transformation, options,
+                                           relevantOptionNames, optionalOptionNames = [] ) {
   const relevant = {};
   for (const name of relevantOptionNames ) {
     if (options[name] !== undefined)
@@ -85,7 +85,7 @@ function attachTransformerCharacteristics(csn, transformation, options,
  * @param {string[]} warnAboutMismatch Option names to warn about, but not error on
  * @param {string} module Name of the module that calls this function, e.g. `for.odata`
  */
-function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMismatch, module) {
+function checkPreTransformedCsn( csn, options, relevantOptionNames, warnAboutMismatch, module ) {
   if (!csn.meta) {
     // Not able to check
     return;
@@ -93,7 +93,7 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
   const { error, warning, throwWithAnyError } = messages.makeMessageFunction(csn, options, module);
 
   for (const name of relevantOptionNames ) {
-    if (options[name] !== csn.meta.options[name]) {
+    if (options[name] !== csn.meta.options?.[name]) {
       error('wrong-pretransformed-csn', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
             'Expected pre-processed CSN to have option $(PROP) set to $(VALUE). Found: $(OTHERVALUE)');
     }
@@ -118,7 +118,7 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
  * @param {string} transformation Name of the transformation
  * @returns {boolean} Return true if it is pre-transformed
  */
-function isPreTransformed(csn, transformation) {
+function isPreTransformed( csn, transformation ) {
   return csn && csn.meta && csn.meta.transformation === transformation;
 }
 
@@ -129,7 +129,7 @@ function isPreTransformed(csn, transformation) {
  * @param {object} internalOptions processed options
  * @returns {object} Return an oData-pre-processed CSN
  */
-function odataInternal(csn, internalOptions) {
+function odataInternal( csn, internalOptions ) {
   const oDataCsn = forOdataNew.transform4odataWithCsn(csn, internalOptions);
   attachTransformerCharacteristics(oDataCsn, 'odata', internalOptions, relevantOdataOptions, warnAboutMismatchOdata);
   return oDataCsn;
@@ -142,7 +142,7 @@ function odataInternal(csn, internalOptions) {
  * @param {ODataOptions} [options={}] Options
  * @returns {oDataCSN} Return an oData-pre-processed CSN
  */
-function odata(csn, options = {}) {
+function odata( csn, options = {} ) {
   const internalOptions = prepareOptions.for.odata(options);
   return odataInternal(csn, internalOptions);
 }
@@ -154,9 +154,9 @@ function odata(csn, options = {}) {
  * @param {object} [externalOptions={}] Options
  * @returns {object} { model: string, namespace: string }
  */
-function cdl(csn, externalOptions = {}) {
+function cdl( csn, externalOptions = {} ) {
   const internalOptions = prepareOptions.to.cdl(externalOptions);
-  return toCdl.csnToCdl(cloneCsnNonDict(csn, internalOptions), internalOptions);
+  return toCdl.csnToCdl(csn, internalOptions);
 }
 
 /**
@@ -167,7 +167,7 @@ function cdl(csn, externalOptions = {}) {
  * @returns {CSN.Model} CSN transformed like to.sql
  * @private
  */
-function forSql(csn, options = {}) {
+function forSql( csn, options = {} ) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
   const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(csn, internalOptions, 'to.sql');
@@ -182,7 +182,7 @@ function forSql(csn, options = {}) {
  * @returns {CSN.Model} CSN transformed like to.hdi
  * @private
  */
-function forHdi(csn, options = {}) {
+function forHdi( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdi(options);
   internalOptions.transformation = 'sql';
   const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(csn, internalOptions, 'to.hdi');
@@ -197,7 +197,7 @@ function forHdi(csn, options = {}) {
  * @returns {CSN.Model} CSN transformed like to.hdbcds
  * @private
  */
-function forHdbcds(csn, options = {}) {
+function forHdbcds( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdbcds(options);
   internalOptions.transformation = 'hdbcds';
 
@@ -213,7 +213,7 @@ function forHdbcds(csn, options = {}) {
  * @param {SqlOptions} [options={}] Options
  * @returns {SQL[]} Array of SQL statements, tables first, views second
  */
-function sql(csn, options = {}) {
+function sql( csn, options = {} ) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
 
@@ -243,7 +243,7 @@ function sql(csn, options = {}) {
  *                                  multiple statements concatenated as a multi-line string in case the change e.g.
  *                                  consists of a column drop and add).
  */
-function mtx(csn, deltaCsn, options = {}) {
+function mtx( csn, deltaCsn, options = {} ) {
   if (!baseModel.isBetaEnabled(options, 'to.mtx'))
     throw new Error('to.mtx is only available with beta flag `to.mtx`');
 
@@ -277,7 +277,7 @@ function mtx(csn, deltaCsn, options = {}) {
  * @param {HdiOptions} [options={}] Options
  * @returns {HDIArtifacts} { <filename>:<content>, ...}
  */
-function hdi(csn, options = {}) {
+function hdi( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdi(options);
 
   // we need the CSN for view sorting
@@ -333,7 +333,7 @@ function hdi(csn, options = {}) {
  * @param {Function} filter Filter for keys not to remap
  * @returns {object} New result structure
  */
-function remapNames(dict, csn, filter) {
+function remapNames( dict, csn, filter ) {
   const result = Object.create(null);
 
   forEach(dict, (key, value) => {
@@ -353,7 +353,7 @@ function remapNames(dict, csn, filter) {
  * @param {Function} filter Filter for keys not to remap
  * @returns {string} Remapped filename
  */
-function remapName(key, csn, filter = () => true) {
+function remapName( key, csn, filter = () => true ) {
   if (filter(key)) {
     const lastDot = key.lastIndexOf('.');
     const prefix = key.slice(0, lastDot);
@@ -379,13 +379,10 @@ function remapName(key, csn, filter = () => true) {
  *                                  - drops: An array of SQL statements to drop views/tables
  *                                  - createsAndAlters: An array of SQL statements to ALTER/CREATE tables/views
  */
-function sqlMigration(csn, options, beforeImage) {
+function sqlMigration( csn, options, beforeImage ) {
   const internalOptions = prepareOptions.to.sql(options);
   const { error, throwWithError } = messages.makeMessageFunction(csn, options, 'to.sql.migration');
 
-  if (!isBetaEnabled(internalOptions, 'sqlMigration'))
-    throw new Error('Function `to.sql.migration` requires beta-flag `sqlMigration`');
-
   // Prepare after-image.
   const afterImage = forSql(csn, options);
   // Compare both images.
@@ -398,10 +395,12 @@ function sqlMigration(csn, options, beforeImage) {
     Object.entries(diff.deletions).forEach(entry => diffFilterObj.deletion(entry, error));
   }
 
+  const identifierUtils = sqlUtils.getIdentifierUtils(csn, internalOptions);
+
   const drops = {
     creates: {},
     final: Object.entries(diff.deletions).reduce((previous, [ name, artifact ]) => {
-      previous[name] = `DROP ${ (artifact.query || artifact.projection) ? 'VIEW' : 'TABLE' } ${ artifact['@cds.persistence.name'] };`;
+      previous[name] = `DROP ${ (artifact.query || artifact.projection) ? 'VIEW' : 'TABLE' } ${ identifierUtils.renderArtifactName(name) };`;
       return previous;
     }, {}),
   };
@@ -417,7 +416,7 @@ function sqlMigration(csn, options, beforeImage) {
         (diffArtifact.query || diffArtifact.projection) &&
         (diffArtifact[modelCompare.isChanged] === true || // we know it changed because we compared two views
           diffArtifact[modelCompare.isChanged] === undefined)) { // if it was removed in the after, then we don't have the flag
-        drops.creates[artifactName] = `DROP VIEW ${ diffArtifact['@cds.persistence.name'] };`;
+        drops.creates[artifactName] = `DROP VIEW ${ identifierUtils.renderArtifactName(artifactName) };`;
       } // TODO: What happens with a changed kind -> entity becomes a view?
       else if (diffArtifact &&
         diffArtifact['@cds.persistence.skip'] !== true &&
@@ -489,7 +488,7 @@ function sqlMigration(csn, options, beforeImage) {
  *                                  is known, i.e. for the very first migration step
  * @returns {migration} The migration result
  */
-function hdiMigration(csn, options, beforeImage) {
+function hdiMigration( csn, options, beforeImage ) {
   const internalOptions = prepareOptions.to.hdi(options);
 
   // Prepare after-image.
@@ -520,7 +519,7 @@ function hdiMigration(csn, options, beforeImage) {
  * @param {CSN.Model} afterImage CSN, used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name, suffix and sql
  */
-function createSqlDefinitions(hdbkinds, afterImage) {
+function createSqlDefinitions( hdbkinds, afterImage ) {
   const result = [];
   forEach(hdbkinds, (kind, artifacts) => {
     const suffix = `.${ kind }`;
@@ -540,7 +539,7 @@ function createSqlDefinitions(hdbkinds, afterImage) {
  * @param {CSN.Model} beforeImage CSN used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name and suffix - only .hdbtable as suffix for now
  */
-function createSqlDeletions(deletions, beforeImage) {
+function createSqlDeletions( deletions, beforeImage ) {
   const result = [];
   forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' }));
   return result;
@@ -552,7 +551,7 @@ function createSqlDeletions(deletions, beforeImage) {
  * @param {CSN.Model} afterImage CSN used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name, suffix and changeset.
  */
-function createSqlMigrations(migrations, afterImage) {
+function createSqlMigrations( migrations, afterImage ) {
   const result = [];
   forEach(migrations, (name, changeset) => result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset }));
   return result;
@@ -569,15 +568,13 @@ sql.migration = sqlMigration;
  * @param {HdbcdsOptions} [options={}] Options
  * @returns {HDBCDS} { <filename>:<content>, ...}
  */
-function hdbcds(csn, options = {}) {
-  timetrace.timetrace.start('to.hdbcds');
+function hdbcds( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdbcds(options);
   internalOptions.transformation = 'hdbcds';
 
   const hanaCsn = forHdbcds(csn, internalOptions);
 
   const result = flattenResultStructure(toHdbcdsSource(hanaCsn, internalOptions));
-  timetrace.timetrace.stop();
   return result;
 }
 /**
@@ -587,7 +584,7 @@ function hdbcds(csn, options = {}) {
  * @param {ODataOptions} [options={}] Options
  * @returns {edm} The JSON representation of the service
  */
-function edm(csn, options = {}) {
+function edm( csn, options = {} ) {
   // If not provided at all, set service to undefined to trigger validation
   const internalOptions = prepareOptions.to.edm(
     // eslint-disable-next-line comma-dangle
@@ -617,7 +614,7 @@ edm.all = edmall;
  * @param {ODataOptions} [options={}] Options
  * @returns {edms} { <service>:<JSON representation>, ...}
  */
-function edmall(csn, options = {}) {
+function edmall( csn, options = {} ) {
   const internalOptions = prepareOptions.to.edm(options);
   const { error } = messages.makeMessageFunction(csn, internalOptions, 'for.odata');
 
@@ -647,7 +644,7 @@ function edmall(csn, options = {}) {
  * @param {ODataOptions} [options={}] Options
  * @returns {edmx} The XML representation of the service
  */
-function edmx(csn, options = {}) {
+function edmx( csn, options = {} ) {
   // If not provided at all, set service to undefined to trigger validation
   const internalOptions = prepareOptions.to.edmx(
     // eslint-disable-next-line comma-dangle
@@ -678,7 +675,7 @@ edmx.all = edmxall;
  * @param {ODataOptions} [options={}] Options
  * @returns {edmxs} { <service>:<XML representation>, ...}
  */
-function edmxall(csn, options = {}) {
+function edmxall( csn, options = {} ) {
   const internalOptions = prepareOptions.to.edmx(options);
 
   const result = {};
@@ -710,11 +707,11 @@ function edmxall(csn, options = {}) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Rendered EDMX string for the given service.
  */
-function preparedCsnToEdmx(csn, service, options) {
-  const e = csn2edm(csn, service, options);
-  return {
-    edmx: (e ? e.toXML('all') : undefined),
-  };
+function preparedCsnToEdmx( csn, service, options ) {
+  timetrace.timetrace.start('EDMX rendering');
+  const e = csn2edm(csn, service, options)?.toXML('all');
+  timetrace.timetrace.stop('EDMX rendering');
+  return { edmx: e };
 }
 
 /**
@@ -725,14 +722,13 @@ function preparedCsnToEdmx(csn, service, options) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Dictionary of rendered EDMX strings for each service.
  */
-function preparedCsnToEdmxAll(csn, options) {
+function preparedCsnToEdmxAll( csn, options ) {
+  timetrace.timetrace.start('EDMX all rendering');
   const edmxResult = csn2edmAll(csn, options);
   for (const service in edmxResult)
     edmxResult[service] = edmxResult[service].toXML('all');
-
-  return {
-    edmx: edmxResult,
-  };
+  timetrace.timetrace.stop('EDMX all rendering');
+  return { edmx: edmxResult };
 }
 
 /**
@@ -744,13 +740,13 @@ function preparedCsnToEdmxAll(csn, options) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Rendered EDM JSON object for of the given service.
  */
-function preparedCsnToEdm(csn, service, options) {
+function preparedCsnToEdm( csn, service, options ) {
+  timetrace.timetrace.start('EDM rendering');
   // Override OData version as edm json is always v4
   options.odataVersion = 'v4';
-  const e = csn2edm(csn, service, options);
-  return {
-    edmj: (e ? e.toJSON() : undefined),
-  };
+  const e = csn2edm(csn, service, options)?.toJSON();
+  timetrace.timetrace.stop('EDM rendering');
+  return { edmj: e };
 }
 
 /**
@@ -761,13 +757,14 @@ function preparedCsnToEdm(csn, service, options) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Dictionary of rendered EDM JSON objects for each service.
  */
-function preparedCsnToEdmAll(csn, options) {
+function preparedCsnToEdmAll( csn, options ) {
+  timetrace.timetrace.start('EDM all rendering');
   // Override OData version as edm json is always v4
   options.odataVersion = 'v4';
   const edmj = csn2edmAll(csn, options);
   for (const service in edmj)
     edmj[service] = edmj[service].toJSON();
-
+  timetrace.timetrace.stop('EDM all rendering');
   return {
     edmj,
   };
@@ -782,7 +779,7 @@ function preparedCsnToEdmAll(csn, options) {
  * @param {object} toProcess { <type>: { <name>:<content>, ...}, <type>: ...}
  * @returns {object} { <name.type>:<content> }
  */
-function flattenResultStructure(toProcess) {
+function flattenResultStructure( toProcess ) {
   const result = {};
   forEach(toProcess, (fileType, artifacts) => {
     if (fileType === 'messages')
@@ -849,9 +846,14 @@ function publishCsnProcessor( processor, _name ) {
         checkRemovedDeprecatedFlags( options, messageFunctions );
       }
       checkOutdatedOptions( options );
-      return processor( csn, options, ...args );
+
+      timetrace.timetrace.start(_name);
+      const result = processor( csn, options, ...args );
+      timetrace.timetrace.stop(_name);
+      return result;
     }
     catch (err) {
+      timetrace.timetrace.reset('Exception in backend triggered');
       if (err instanceof messages.CompilationError || options.noRecompile || isPreTransformed(csn, 'odata')) // we cannot recompile a pre-transformed CSN
         throw err;
 
@@ -882,7 +884,7 @@ const oldBackendOptionNames = [ 'toSql', 'toOdata', 'toHana', 'forHana' ];
  *
  * @param {CSN.Options} options Backend options
  */
-function checkOutdatedOptions(options) {
+function checkOutdatedOptions( options ) {
   const { error, throwWithError } = messages.makeMessageFunction(null, options, 'api');
 
   // This error has been emitted once, we don't need to emit it again.
@@ -920,7 +922,7 @@ function checkOutdatedOptions(options) {
  * @param {string} moduleName Name of the module to load - like with require
  * @returns {object} A Proxy that handles the on-demand loading
  */
-function lazyload(moduleName) {
+function lazyload( moduleName ) {
   let module;
   return new Proxy(((...args) => {
     if (!module) // eslint-disable-next-line global-require

package/lib/api/options.js

@@ -15,6 +15,7 @@ const publicOptionsNewAPI = [
   'severities',
   'messages',
   'withLocations',
+  'structXpr',
   'defaultBinaryLength',
   'defaultStringLength',
   'csnFlavor',
@@ -30,6 +31,7 @@ const publicOptionsNewAPI = [
   'odataVersion',
   'odataFormat',
   'odataContainment',
+  'odataCapabilitiesPullup',
   'odataForeignKeys',
   'odataProxies',
   'odataXServiceRefs',
@@ -75,8 +77,8 @@ const overallOptions = publicOptionsNewAPI.concat(privateOptions);
  * @param {string} moduleName The called module, e.g. 'for.odata', 'to.hdi'. Needed to initialize the message functions
  * @returns {TranslatedOptions} General cds options
  */
-function translateOptions(input = {}, defaults = {}, hardRequire = {},
-                          customValidators = {}, combinationValidators = [], moduleName = '') {
+function translateOptions( input = {}, defaults = {}, hardRequire = {},
+                           customValidators = {}, combinationValidators = [], moduleName = '' ) {
   const options = Object.assign({}, defaults);
   for (const name of overallOptions) {
     // Ensure that arrays are not passed as a reference!

package/lib/api/validate.js

@@ -31,7 +31,7 @@ const booleanValidator = {
  * @param {any} availableValues Available values
  * @returns {Validator} Return a validator for a string in an expected range
  */
-function generateStringValidator(availableValues) {
+function generateStringValidator( availableValues ) {
   return {
     validate: val => typeof val === 'string' && availableValues.some( av => av.toLowerCase() === val.toLowerCase() ),
     expected: (val) => {
@@ -152,7 +152,7 @@ const allCombinationValidators = {
  * @returns {void}
  * @throws {CompilationError} Throws in case of invalid option usage
  */
-function validate(options, moduleName, customValidators = {}, combinationValidators = []) {
+function validate( options, moduleName, customValidators = {}, combinationValidators = [] ) {
   // TODO: issuing messages in this function looks very strange...
   {
     const messageCollector = { messages: [] };

package/lib/base/cleanSymbols.js

@@ -7,10 +7,9 @@
  * @param {object} obj
  * @param  {...any} symbols
  */
-function cleanSymbols(obj, ...symbols) {
-  for (const symbol of symbols) {
+function cleanSymbols( obj, ...symbols ) {
+  for (const symbol of symbols)
     delete obj[symbol];
-  }
 }
 
 module.exports = {

package/lib/base/dictionaries.js

@@ -20,7 +20,7 @@ function dictAdd( dict, name, entry, duplicateCallback ) {
   }
   found.$duplicates.push( entry );
   if (Array.isArray( entry.$duplicates ))
-    found.$duplicates.push( ...entry.$duplicates )
+    found.$duplicates.push( ...entry.$duplicates );
   else if (duplicateCallback && name) // do not complain with empty name ''
     duplicateCallback( name, entry.name.location, entry );
   entry.$duplicates = true;
@@ -48,7 +48,7 @@ function dictForEach( dict, callback ) {
 // `entry.name.location`.  If this is the first duplicate entry and if the
 // `filename`s are different, call the callback again on `found.name.location`.
 function dictAddArray( dict, name, entry, messageCallback ) {
-  var found = dict[name];
+  const found = dict[name];
   if (!found || found.builtin) { // do not replace a builtin definition
     dict[name] = entry;         // also ok if array (redefined)
     return entry;
@@ -86,12 +86,12 @@ function pushToDict( dict, name, entry ) {
   if (dict[name])
     dict[name].push( entry );
   else
-    dict[name] = [entry];
+    dict[name] = [ entry ];
 }
 
 module.exports = {
-  dictAdd, dictForEach,
+  dictAdd,
+  dictForEach,
   dictAddArray,
   pushToDict,
-}
-
+};

package/lib/base/error.js

@@ -6,7 +6,7 @@
  */
 class CompilerAssertion extends Error {
   constructor(message) {
-    super(`cds-compiler assertion failed: ${message}`);
+    super(`cds-compiler assertion failed: ${ message }`);
   }
 }
 
@@ -16,7 +16,7 @@ class CompilerAssertion extends Error {
  */
 class ModelError extends Error {
   constructor(message) {
-    super(`cds-compiler model error: ${message}`);
+    super(`cds-compiler model error: ${ message }`);
   }
 }
 

package/lib/base/keywords.js

@@ -185,7 +185,7 @@ module.exports = {
     'WHERE',
     'WINDOW',
     'WITH',
-    'WITHOUT'
+    'WITHOUT',
   ],
   // SAP HANA keywords, used for smart quoting in to-hdi.plain
   // See './scripts/keywords/hana/generateSqlKeywords.js'
@@ -706,7 +706,7 @@ module.exports = {
     'WITH',
     'WITHIN',
     'XMLTABLE',
-    'YEAR'
+    'YEAR',
   ],
   // SAP HANA CDS keywords, used for smart quoting in to-hdbcds.plain
   hdbcds: [
@@ -841,7 +841,7 @@ module.exports = {
     'WHEN',
     'WHERE',
     'WINDOW',
-    'WITH'
+    'WITH',
   ],
   // H2 keywords, used for smart quoting in to-sql.plain.postgres
   // Taken from http://www.h2database.com/html/advanced.html#keywords
@@ -945,6 +945,6 @@ module.exports = {
     'WINDOW',
     'WITH',
     'YEAR',
-    '_ROWID_'
-  ]
-}
+    '_ROWID_',
+  ],
+};

package/lib/base/location.js

@@ -39,7 +39,7 @@ function combinedLocation( start, end ) {
  *
  * TODO: make this function redundant (XSN sparse locations project)
  */
-function emptyLocation(filename) {
+function emptyLocation( filename ) {
   return {
     file: filename,
     line: 1,
@@ -58,7 +58,7 @@ function emptyLocation(filename) {
  *
  * TODO: make this function redundant (XSN sparse locations project)
  */
-function emptyWeakLocation(filename) {
+function emptyWeakLocation( filename ) {
   return {
     file: filename,
     line: 1,
@@ -90,9 +90,9 @@ function locationString( location, normalizeFilename ) {
   if (!location)
     return '<???>';
   const loc = location;
-  let filename = (loc.file && normalizeFilename)
-      ? loc.file.replace( /\\/g, '/' )
-      : loc.file;
+  const filename = (loc.file && normalizeFilename)
+    ? loc.file.replace( /\\/g, '/' )
+    : loc.file;
   if (!(loc instanceof Object))
     return loc;
   if (!loc.line) {
@@ -100,14 +100,13 @@ function locationString( location, normalizeFilename ) {
   }
   else if (!loc.endLine) {
     return (loc.col)
-      ? `${filename}:${loc.line}:${loc.col}`
-      : `${filename}:${loc.line}`;
-  }
-  else {
-    return (loc.line === loc.endLine)
-      ? `${filename}:${loc.line}:${loc.col}-${loc.endCol}`
-      : `${filename}:${loc.line}.${loc.col}-${loc.endLine}.${loc.endCol}`;
+      ? `${ filename }:${ loc.line }:${ loc.col }`
+      : `${ filename }:${ loc.line }`;
   }
+
+  return (loc.line === loc.endLine)
+    ? `${ filename }:${ loc.line }:${ loc.col }-${ loc.endCol }`
+    : `${ filename }:${ loc.line }.${ loc.col }-${ loc.endLine }.${ loc.endCol }`;
 }
 
 /**