@sap/cds-compiler 3.4.2 → 3.4.4

package/lib/transform/localized.js

@@ -2,7 +2,6 @@
 
 const { makeMessageFunction } = require('../base/messages');
 const { setProp, isDeprecatedEnabled} = require('../base/model');
-const { hasErrors } = require('../base/messages');
 const { forEachKey } = require('../utils/objectUtils');
 const { cleanSymbols } = require('../base/cleanSymbols.js');
 const {
@@ -44,7 +43,10 @@ const _targetFor = Symbol('_targetFor');
  */
 
 /**
- * Create transitive localized convenience views
+ * Create transitive localized convenience views.
+ *
+ * A convenience view is created if the entity/view has a localized element
+ * or if it exposes an association leading to a localized-tagged target.
  *
  * INTERNALS:
  * We have three kinds of localized convenience views:
@@ -72,13 +74,11 @@ const _targetFor = Symbol('_targetFor');
  * @param {object} config
  */
 function _addLocalizationViews(csn, options, useJoins, config) {
-  // Don't try to create convenience views with errors.
-  if (hasErrors(options.messages)) // TODO: this is actually wrong, consider --test-mode
-    return csn;
-
   const messageFunctions = makeMessageFunction(csn, options);
-  if (hasExistingLocalizationViews(csn, options, messageFunctions))
+  if (checkExistingLocalizationViews(csn, options, messageFunctions)) {
+    messageFunctions.throwWithError();
     return csn;
+  }
 
   const { acceptLocalizedView, ignoreUnknownExtensions } = config;
   const noCoalesce = (options.localizedLanguageFallback === 'none' ||
@@ -89,6 +89,7 @@ function _addLocalizationViews(csn, options, useJoins, config) {
   cleanDefinitionSymbols();
   applyAnnotationsForLocalizedViews();
   sortCsnDefinitionsForTests(csn, options);
+  messageFunctions.throwWithError();
   return csn;
 
   /**
@@ -711,7 +712,7 @@ function copyPersistenceAnnotations(target, source, options) {
  * @param {CSN.Options} options
  * @param {object} messageFunctions
  */
-function hasExistingLocalizationViews(csn, options, messageFunctions) {
+function checkExistingLocalizationViews(csn, options, messageFunctions) {
   if (!csn || !csn.definitions)
     return false;
 

package/lib/transform/odata/typesExposure.js

@@ -108,9 +108,10 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
       if (newType) {
         // error, if it was not exposed by us
         if (!exposedTypes[fullQualifiedNewTypeName]) {
+          setProp(node, '$NameClashReported', true);
           error(null, path, { type: fullQualifiedNewTypeName, name: memberName },
             'Can\'t create artificial type $(TYPE) for $(NAME) because the name is already used');
-          return;
+          return { isExposable, typeDef, typeName, isAnonymous };
         }
       }
       else {
@@ -132,8 +133,28 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
           if (node.elements && node.elements[elemName].$location)
             setProp(newElem, '$location', node.elements[elemName].$location);
           defName = typeDef.kind === 'type' ? typeName : defName;
-          exposeTypeOf(newElem, isKey, elemName, defName, serviceName,
-                       getNewTypeName(newElem, elemName, newTypeName, serviceName), path, fullQualifiedNewTypeName);
+          {
+            const { isExposable, typeDef, typeName } = exposeTypeOf(newElem, isKey, elemName, defName, serviceName,
+                           getNewTypeName(newElem, elemName, newTypeName, serviceName), path, fullQualifiedNewTypeName);
+            // if the type for the newElem was not exposed it may be a scalar type def from an external service that hasn't
+            // been catched by expandToFinalBaseType() (forODataNew must not modify external imported services)
+            if(!isExposable && isBuiltinType(typeName) && !isBuiltinType((newElem.items?.type || newElem.type))) {
+              if(typeDef.items) {
+                newElem.items = typeDef.items;
+                delete newElem.type;
+              }
+              else if(newElem.items) {
+                newElem.items.type = typeName;
+                if(typeDef.enum)
+                  newElem.items.enum = typeDef.enum;
+              }
+              else {
+                newElem.type = typeName;
+                if(typeDef.enum)
+                  newElem.enum = typeDef.enum;
+              }
+            }
+          }
         });
         copyAnnotations(typeDef, newType);
         // if the origin type had items, add items to exposed type
@@ -155,6 +176,7 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
         node.type = fullQualifiedNewTypeName;
       }
     }
+    return { isExposable, typeDef, typeName, isAnonymous };
 
      /**
      * Check if the node's type can be exposed:
@@ -197,7 +219,7 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
           }
         }
       }
-      return { isExposable: false };
+      return { isExposable: false, typeDef, typeName, isAnonymous: false };
     }
 
 

package/lib/transform/transformUtilsNew.js

@@ -1220,17 +1220,24 @@ function getTransformers(model, options, pathDelimiter = '_') {
             }
             // t_0 OR ... OR t_n with t = (a <not equal> b)
             const bop = (op === 'is' && not) || op === '!=' || op === '<>' ? 'or' : 'and';
-            rc.push('(');
+            const xpr = { xpr: [] };
             xrefvalues.filter(x => x.lhs && x.rhs).forEach((x,i) => {
-              if(i>0)
-                rc.push(bop);
-              rc.push(x.lhs);
-              rc.push(op);
+              xpr.i = i;
+              if(i>0) {
+                xpr.xpr.push(bop);
+              }
+              xpr.xpr.push(x.lhs);
+              xpr.xpr.push(op);
               if(not)
-                rc.push('not')
-              rc.push(x.rhs);
+                xpr.xpr.push('not')
+              xpr.xpr.push(x.rhs);
             });
-            rc.push(')');
+            if(xpr.i > 0) {
+              delete xpr.i;
+              rc.push(xpr);
+            }
+            else
+              rc.push(...xpr.xpr);
             i += not ? 3 : 2;
           }
           else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -30,7 +30,7 @@
     "testmigration": "npm install --no-save @sap/hana-client@2.3.123 @sap/hdi-deploy@3.10.0 && node scripts/verifyGrammarChecksum.js && cross-env TESTMIGRATION='TRUE' mocha",
     "testall": "npm install --no-save @sap/hana-client@2.3.123 @sap/hdi-deploy@3.10.0 && node scripts/verifyGrammarChecksum.js && cross-env TESTDB='TRUE' TESTMIGRATION='TRUE' mocha",
     "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/ && nyc report --reporter=lcov",
-    "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ types/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint .",
+    "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ types/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && node scripts/linter/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint .",
     "tslint": "tsc --pretty -p .",
     "updateVocs": "node scripts/odataAnnotations/generateDictMain.js && npm run generateAllRefs",
     "generateCompilerRefs": "cross-env MAKEREFS='true' mocha test/testCompiler.js",
@@ -41,7 +41,6 @@
     "generateToSqlRefs": "cross-env MAKEREFS='true' mocha test/testToSql.js",
     "generateToRenameRefs": "cross-env MAKEREFS='true' mocha test/testToRename.js",
     "generateChecksRefs": "cross-env MAKEREFS='true' mocha test/testChecks.js",
-    "generateScenarioRefs": "cross-env MAKEREFS='true' mocha test/testScenarios.js",
     "generateDraftRefs": "cross-env MAKEREFS='true' mocha test/testDraft.js",
     "generateAllRefs": "node scripts/verifyGrammarChecksum.js && cross-env MAKEREFS='true' mocha --reporter-option maxDiffSize=0 test/ test3/"
   },

package/lib/modelCompare/filter.js

@@ -1,83 +0,0 @@
-// Each db has some changes that it can and cannot represent, or that cause problems only on that specific db
-// In this file, we define rules for each db-dialect to detect and act on these cases.
-
-const { forEach } = require("../utils/objectUtils");
-const { isPersistedAsTable } = require('../model/csnUtils');
-
-function isKey(element) {
-  return element.key;
-}
-
-module.exports = {
-  sqlite: getFilterObject(
-    'sqlite', 
-    (extend, name, element, error) => {
-      if(isKey(element)) { // Key must not be extended
-        error(null, ['definitions', extend, 'elements', name], {id: name, name: 'sqlite'}, "Added element $(ID) is a primary key change and will not work with $(NAME)")
-      }
-    },
-    (migrate, name, migration, change, error) => {
-      const newIsKey = isKey(migration.new);
-      const oldIsKey = isKey(migration.old);
-      if((newIsKey || oldIsKey) && oldIsKey !== newIsKey) { // Turned into key or key was removed
-        error(null, ['definitions', migrate, 'elements', name], {id: name, name: 'sqlite'}, "Changed element $(ID) is a primary key change and will not work with $(NAME)")
-      } else { // Ignore simple migrations
-        delete change[name];
-      }
-    })
-}
-
-function getFilterObject(dialect, extensionCallback, migrationCallback) {
-  return {
-        // will be called with a simple Array.forEach
-    extension: ({ elements, extend }, error) => {
-      forEach(elements, (name, element) => {
-        extensionCallback(extend, name, element, error);
-      });
-    },
-    // will be called with a Array.map, as we need to filter "change" for SQLite
-    migration: ({ change, migrate, remove }, error) => {
-      forEach(remove, (name) => {
-        error(null, ['definitions', migrate, 'elements', name], {}, "Dropping elements is not supported")
-      });
-
-      forEach(change, (name, migration) => {
-        if(migration.new.type !== migration.old.type && typeChangeIsNotCompatible(dialect, migration.old.type, migration.new.type)) {
-          error(null, ['definitions', migrate, 'elements', name], { id: name, name: migration.old.type, type: migration.new.type }, "Changed element $(ID) is a lossy type change from $(NAME) to $(TYPE) and is not supported")
-        } else if(migration.new.length < migration.old.length) {
-          error(null, ['definitions', migrate, 'elements', name], { id: name }, "Changed element $(ID) is a length reduction and is not supported")
-        } else {
-          migrationCallback(migrate, name, migration, change, error);
-        }
-
-        // TODO: precision/scale growth
-      });
-    },
-    deletion: ([artifactName, artifact ], error) => {
-      if(isPersistedAsTable(artifact))
-        error(null, ['definitions', artifactName], "Dropping tables is not supported");
-    }
-  }
-}
-
-const baseMatrix = {
-  // Integer types
-  'cds.hana.tinyint':['cds.UInt8', 'cds.Int16', 'cds.Int32', 'cds.Integer', 'cds.Int64', 'cds.Integer64'],
-  'cds.UInt8': ['cds.hana.tinyint', 'cds.Int16', 'cds.Int32', 'cds.Integer', 'cds.Int64', 'cds.Integer64'],
-  'cds.Int16': ['cds.hana.smallint', 'cds.Int32', 'cds.Integer', 'cds.Int64', 'cds.Integer64'],
-  'cds.hana.smallint':['cds.Int16', 'cds.Int32', 'cds.Integer', 'cds.Int64', 'cds.Integer64'],
-  'cds.Int32': ['cds.Integer', 'cds.Int64', 'cds.Integer64'],
-  'cds.Integer': ['cds.Int32', 'cds.Int64', 'cds.Integer64'],
-  'cds.Integer64': ['cds.Int64'],
-  'cds.Int64': ['cds.Integer64']
-}
-
-const allowedTypeChanges = {
-  'sqlite': baseMatrix
-};
-
-function typeChangeIsNotCompatible(dialect, before, after) {
-  if(allowedTypeChanges[dialect])
-    return allowedTypeChanges[dialect][before]?.indexOf(after) === -1;
-  return true;
-}