@sap/cds-compiler 3.0.0 → 3.1.2

package/CHANGELOG.md

@@ -7,27 +7,105 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 3.1.2 - 2022-08-19
+
+### Fixed
+
+- to.edm(x):
+  + `@Capabilities` 'pull up' for containment trees should not prefix the
+    dynamic annotation paths of the root container.
+  + Remove service namespace prefix of a parameter type for function/action annotation targets
+    in multi schema mode if the parameter type is defined in an alternative schema.
+
+## Version 3.1.0 - 2022-08-04
+
+### Added
+
+- Extending an artifact with multiple includes in one extend statement is now possible:
+  `extend SomeEntity with FirstInclude, SecondInclude;`
+- Aspects can now have actions and functions, similar to entities.  Aspects can be extended by actions as well.
+- `cdsc`:
+  - `toCsn` now supports `--with-locations` which adds a `$location` property to artifacts
+  - `toHana`/`toSql` now supports `--disable-hana-comments`, which disables rendering of doc-comments for HANA.
+- to.hdi/sql/hdbcds: Support FK-access in `ORDER BY` and `GROUP BY`
+- to.hdi.migration: Detect an implicit change from `not null` to `null` and render corresponding `ALTER`
+
+### Changed
+
+- compiler: If an unknown file extension is used but the file starts with
+  an opening curly brace (`{`), it will be parsed as CSN.
+- to.edm(x): In V4 containment mode, pull up `@Capabilities` annotations from the containees to the root container (set)
+  and translate them into corresponding `@Capabilities.NavigationRestrictions`. If a `NavigationRestriction` is already available
+  for that containment path, capabilities are merged into this path. Capability annotation value paths are prefixed with
+  the navigation restriction path.
+  The capability 'pull up' has an effect on entity annotations only. `@Capabilities` assignments on compositions are not pulled
+  up but rendered to the association type which is important to enable dynamic capabilities on 'to-many' relations and to avoid
+  ambiguities in entity set capabilities.
+- Update OData vocabularies 'Analytics', 'Capabilities', 'Common', 'Core', 'DataIntegration', 'Graph', 'PersonalData', 'UI', 'Validation'.
+
+### Fixed
+
+- Syntax of date/time literals are now checked against ISO 8601. If the format is invalid, a warning is emitted.
+- The code completion directly after the `(` for functions with special syntax
+  now suggests all valid keywords, like for `extract` or `locate_regexpr`.
+- compiler:
+  + `cast(elem as EnumType)` crashed the compiler.
+  + Annotations on sub-elements in query entities were lost during re-compilation.
+  + An association's cardinality was lost for associations published in projections.  
+  + Annotations on indirect action parameters were lost in CSN flavor `gensrc`.
+  + If a file's content starts with `{` and if neither file extension is known nor
+    `fallbackParser` is set, assume the source is CSN.
+- all backends: references in `order by` _expressions_ are correctly resolved.
+- to.edm(x):
+  + Allow cross service references for unmanaged associations and improve warning message for muted associations.
+  + Nested `@UI.TextArrangement` has precedence over `@TextArrangement` shortcut annotation for `@Common.Text`.
+- to.hdi.migration:
+  + Doc comments rendered the _full doc comment_ instead of only the first paragraph, as `to.hdi` does.
+  + Respect option `disableHanaComments` when rendering the `ALTER` statements
+- to.hdi/sql/hdbcds:
+  + Check for invalid usages of `$self` and give helpful errors
+  + Correctly resolve association-steps in the from-clause in conjunction with `exists`
+
+## Version 3.0.2 - 2022-07-05
+
+### Fixed
+
+- to.sql: For `sqlDialect` `plain`, `$now` is replaced by `CURRENT_TIMESTAMP` again.
+- compiler:
+  + Don't crash if a USING filename is invalid on the operating system, e.g. if `\0` is used.
+  + Info messages for annotations on localized convenience views are only emitted for unknown ones.
+  + Improve error message for an `extend` statement which had added a new element
+    and tried to extend that element further.  Similarly for a new action.
+    (If you consider this really of any use, use two `extend` statements.)
+- for.odata: expand `@readonly`/`@insertonly` on aspects as for entities into `@Capabilities`.
+- to.edm(x):
+  + Exclude managed association as primary key on value list annotation preprocessing.
+  + Don't render annotations for aspects defined in a service.
+
 ## Version 3.0.0 - 2022-06-23
 
 ### Added
 
 - Instead of requiring all files on startup, they are required on an as-needed basis to reduce startup times.
-- Allow `*` as argument in SQL functions `count`, `min`, `max`, `sum`, `avg`, `stddev`, `var`.
+- CDL parser: support SQL functions `locate_regexpr`, `occurrences_regexpr`,
+  `replace_regexpr` and `substring_regexpr` with their special argument syntax.
+- CDL parser: the names `trim` and `extract` are not reserved anymore.
 
 ### Changed
 
 - cds-compiler now requires Node 14.
 - `compile()` and its derivates now use `fs.realpath.native()` instead of `fs.realpath()`.
-- Multi-line doc comments without leading `*` were inconsistently trimmed.
+- CDL parser:
+  + Multi-line doc comments without leading `*` were inconsistently trimmed.
+  + As before, a structure value for an annotation assignment in a CDL source is flattened,
+    i.e. `@Anno: { foo: 1, @bar: 2 }` becomes `@Anno.foo: 1 @Anno.@bar: 2`.
+    Now, the structure property name `$value` is basically ignored:
+    `@Anno: { $value: 1, @bar: 2 }` becomes `@Anno: 1 @Anno.@bar: 2`.
+    The advantage is that overwriting or appending the annotation value works as expected.
+  + Keywords `not null` is only valid after `many String enum {...}` and no longer after `String`.
 - `@cds.persistence.skip` and `@cds.persistence.exists` are both copied to generated child artifacts
   such as localized convenience views, texts entities and managed compositions.
-- As before, a structure value for an annotation assignment in a CDL source is flattened,
-  i.e. `@Anno: { foo: 1, @bar: 2 }` becomes `@Anno.foo: 1 @Anno.@bar: 2`.
-  Now, the structure property name `$value` is basically ignored:
-  `@Anno: { $value: 1, @bar: 2 }` becomes `@Anno: 1 @Anno.@bar: 2`.
-  The advantage is that overwriting or appending the annotation value works as expected.
 - Update OData vocabularies 'Common', 'UI'.
-- Keywords `not null` is only valid after `many String enum {...}` and no longer after `String`.
 - (Sub-)Elements of localized convenience views can now be annotated, e.g. `annotate localized.E:elem`.
 - `getArtifactCdsPersistenceName` now enforces the `csn` argument and can optionally have the `sqlDialect` passed in.
 - `getElementCdsPersistenceName` can optionally have the `sqlDialect` passed in.
@@ -36,9 +114,26 @@ The compiler behavior concerning `beta` features can change at any time without
 
 - All v2 deprecated flags.
 - Keyword `masked`.
-- `*` as generic argument to SQL functions/expressions.
+- CDL parser: `*` is not parsed anymore as argument to all SQL functions;
+  it is now only allowed for `count`, `min`, `max`, `sum`, `avg`, `stddev`, `var`.
 - All non-SNAPI options.
 
+## Version 2.15.8 - 2022-08-02
+
+### Fixed
+
+- to.edm(x): Nested `@UI.TextArrangement` has precedence over `@TextArrangement` shortcut annotation for `@Common.Text`.
+- to.hdi.migration:
+  + Respect option `disableHanaComments` when rendering the `ALTER` statements
+  + Doc comments rendered the _full doc comment_ instead of only the first paragraph, as `to.hdi` does.
+- compiler: An association's cardinality was lost for associations published in projections.
+
+## Version 2.15.6 - 2022-07-26
+
+### Fixed
+
+- Annotations on sub-elements were lost during re-compilation.
+
 ## Version 2.15.4 - 2022-06-09
 
 ### Fixed

package/bin/.eslintrc.json

@@ -11,6 +11,7 @@
     "no-process-exit": "off",
     "camelcase": "off",
     "radix": "off",
-    "no-shadow": "warn"
+    "no-shadow": "warn",
+    "global-require": "off"
   }
 }

package/bin/cdsc.js

@@ -63,9 +63,6 @@ function remapCmdOptions(options, command) {
 
   for (const [ key, value ] of Object.entries(options[command])) {
     switch (key) {
-      case 'names':
-        options.sqlMapping = value;
-        break;
       case 'user':
         if (!options.variableReplacements)
           options.variableReplacements = {};
@@ -73,12 +70,6 @@ function remapCmdOptions(options, command) {
           options.variableReplacements.$user = {};
         options.variableReplacements.$user.id = value;
         break;
-      case 'dialect':
-        options.sqlDialect = value;
-        break;
-      case 'version':
-        options.odataVersion = value;
-        break;
       case 'locale':
         if (!options.variableReplacements)
           options.variableReplacements = {};
@@ -89,9 +80,6 @@ function remapCmdOptions(options, command) {
       case 'serviceNames':
         options.serviceNames = value.split(',');
         break;
-      case 'flavor':
-        options.csnFlavor = value;
-        break;
       default:
         options[key] = value;
     }
@@ -158,12 +146,17 @@ function cdsc_main() {
   if (cmdLine.options.rawOutput)
     cmdLine.options.attachValidNames = true;
 
-  // Internally, parseCdl is an option so we map the command to it.
+  // Internally, parseCdl/parseOnly are options, so we map the command to it.
   if (cmdLine.command === 'parseCdl') {
     cmdLine.command = 'toCsn';
     cmdLine.options.parseCdl = true;
     cmdLine.args.files = [ cmdLine.args.file ];
   }
+  else if (cmdLine.command === 'parseOnly') {
+    cmdLine.command = 'toCsn';
+    cmdLine.options.parseOnly = true;
+    cmdLine.args.files = [ cmdLine.args.file ];
+  }
 
   if (cmdLine.options.directBackend)
     validateDirectBackendOption(cmdLine.command, cmdLine.options, cmdLine.args);
@@ -269,6 +262,7 @@ function executeCommandLine(command, options, args) {
     toRename,
     manageConstraints,
     toSql,
+    inspect,
   };
   const commandsWithoutCompilation = {
     explain,
@@ -432,6 +426,24 @@ function executeCommandLine(command, options, args) {
       console.log(explainMessage(args.messageId));
   }
 
+  function inspect(model) {
+    const inspectModel = require('../lib/inspect');
+
+    if (options.statistics) {
+      const result = inspectModel.inspectModelStatistics(model, options);
+      if (result)
+        console.log(result);
+    }
+
+    if (options.propagation) {
+      const result = inspectModel.inspectPropagation(model, options, options.propagation);
+      if (result)
+        console.log(result);
+    }
+
+    return model;
+  }
+
   // Display error messages in `err` resulting from a compilation.  Also set
   // process.exitCode - process.exit() will force the process to exit as quickly
   // as possible = is problematic, since console.error() might be asynchronous
@@ -525,7 +537,7 @@ function executeCommandLine(command, options, args) {
     else if (options.internalMsg) {
       writeToFileOrDisplay(options.out, `${name}_raw.txt`, util.inspect(reveal(xsn).messages, { depth: null, maxArrayLength: null }), true);
     }
-    else if (!options.lintMode) {
+    else if (!options.parseOnly) { // no output if parseOnly but not rawOutput
       const csn = compactModel(xsn, options);
       if (command === 'toCsn' && options.withLocalized)
         addLocalizationViews(csn, options);
@@ -545,7 +557,7 @@ function executeCommandLine(command, options, args) {
     if (options.internalMsg) {
       writeToFileOrDisplay(options.out, `${name}_raw.txt`, options.messages, true);
     }
-    else if (!options.lintMode && !options.internalMsg) {
+    else if (!options.internalMsg) {
       if (command === 'toCsn' && options.withLocalized)
         addLocalizationViews(csn, options);
       writeToFileOrDisplay(options.out, `${name}.json`, csn, true);
@@ -558,7 +570,7 @@ function executeCommandLine(command, options, args) {
   // If displaying to stdout, prepend a headline containing 'filename', unless 'omitHeadline' is set.
   // For filenames, illegal characters (slash, backslash, colon) are replaced by '_'.
   function writeToFileOrDisplay(dir, fileName, content, omitHeadline = false) {
-    if (options.lintMode && !options.rawOutput || options.internalMsg)
+    if (options.internalMsg)
       return;
     fileName = fileName.replace(/[:/\\]/g, '_');
 

package/doc/API.md

@@ -0,0 +1,11 @@
+# CDS Compiler API Documentation
+
+The API of `@sap/cds-compiler` is described in a TypeScript declaration file
+[`main.d.ts`](../lib/main.d.ts).
+
+Refer to that file for documentation on option names, API calls, and more.
+
+You can use [TypeDoc] to render an HTML documentation from it.
+
+
+[TypeDoc]: https://typedoc.org/

package/doc/CHANGELOG_ARCHIVE.md

@@ -270,7 +270,7 @@ The compiler behaviour concerning `beta` features can change at any time without
 - to.sql/hdi/hdbcds:
   + Doc comments are translated into HANA comments (or into `@Comment` annotation for `to.hdbcds`).
   Such comments are possible on entities, views, elements of entities and `to.hdbcds` also supports comments on view columns.
-  Generation can be disabled via option `disableHanaComments`. Entites/views (and their elements/columns)
+  Generation can be disabled via option `disableHanaComments`. Entities/views (and their elements/columns)
   annotated with `@cds.persistence.journal` for `to.hdi`/`to.sql` will not have comments rendered.
   + Generation of temporal `WHERE` clause can be suppressed by annotating the `validFrom`/`validTo` elements of the projection with `false` or `null`.
 - to.sql/hdi/hdbcds/edm(x)/for.odata: Structure/managed association comparisons (tuple comparisons) are now

package/doc/CHANGELOG_BETA.md

@@ -8,7 +8,29 @@ Note: `beta` fixes, changes and features are listed in this ChangeLog just for i
 The compiler behavior concerning `beta` features can change at any time without notice.
 **Don't use `beta` fixes, changes and features in productive mode.**
 
-## Version 3.0.0 - 2022-XX-YY
+## Version 3.1.0 - 2022-08-04
+
+### Added `optionalActionFunctionParameters`
+
+- to.edm(x): Annotate optional function/action parameters with `@Core.OptionalParameter` for OData V4.
+  An action/function parameter is optional if
+  1) it is already annotated with `@Core.OptionalParameter` regardless of its definition.
+  2) it has a default value (including null), regardless of it's nullability
+  3) it has NO default value but is nullable (the implicit default value is null)
+
+  If a mandatory parameter (not null and no default value) appears after an optional
+  parameter, a warning is raised, Core.OptionalParameter requires that all optional
+  parameters appear rightmost.
+
+### Added `odataOpenType`
+
+- to.edm(x): Support annotation `@open` on entity and structured type level to declare the corresponding entity/complex type to
+  be `OpenType=true`. If an open structured type is declared closed (with a falsy annotation value), the corresponding EDM type
+  is closed as well and suffixed with `_closed` (or `_open` vice versa).
+  No further checks are performed on possibly open foreign or primary key types nor on eventually bucket elements to store the
+  additional data.
+
+## Version 3.0.0 - 2022-06-23
 
 ### Removed `addTextsLanguageAssoc`
 
@@ -134,7 +156,7 @@ When the beta option `subElemRedirections` is set to true,
 _all_ array (new!) and structure types are expanded when referenced:
 managed associations (and compositions to entities) in that array are
 implicitly redirected when necessary.
-See [below for details](#version-1300---20200612).
+See [below for details](#version-1300---2020-06-12).
 
 Nested array types (without intermediate structure types) are not supported.
 

package/doc/CHANGELOG_DEPRECATED.md

@@ -11,10 +11,28 @@ Note: `deprecated` features are listed in this ChangeLog just for information.
 **When the `deprecated` option is set, the `beta` option is ignored,
 and several new features are not available.**
 
-## Version 3.0.0 - 2022-XX-YY
+## Version 3.1.0 - 2022-08-04
+
+### Added `autoCorrectOrderBySourceRefs`
+
+When this option is set, calling `compile` auto-corrects direct `order by`
+source element references without table alias for SELECT queries by adding the
+table alias to the `ref`.
+
+Using this option might lead to surprising results when elements are added to
+existing models: `order by` specifications might change their semantics without
+any extra messages.
+
+## Version 3.0.0 - 2022-06-23
 
 Version 3 of the cds-compiler removes all v2 deprecated flags.
 
+### Add `eagerPersistenceForGeneratedEntities`
+
+If enabled, the old behavior regarding `@cds.persistence.skip` and `@cds.persistence.exists`
+is restored, i.e. these annotations are not copied from parent to generated child entities, nor
+is `@cds.persistence.exists` copied to localized convenience views.
+
 ### Removed `createLocalizedViews`
 
 ### Removed `downgradableErrors`
@@ -25,6 +43,8 @@ Version 3 of the cds-compiler removes all v2 deprecated flags.
 
 ### Removed `noElementsExpansion`
 
+<!-- fully removed with 3.1.0 -->
+
 ### Removed `noInheritedAutoexposeViaComposition`
 
 ### Removed `noScopedRedirections`

package/lib/api/main.js

@@ -226,6 +226,50 @@ function sql(csn, options = {}) {
   return result.map(obj => obj.sql).filter(create => create);
 }
 
+/**
+ * Render the given deltaCSN as SQL.
+ *
+ * @param {CSN.Model} csn A clean input CSN
+ * @param {CSN.Model} deltaCsn A CSN representing new entities and extensions
+ * @param {SqlOptions} [options={}] Options
+ * @returns {object} - definitions: An array of objects with all artifacts in the after-image. Each object specifies
+ *                                  the artifact filename, the suffix, and the corresponding SQL statement to create
+ *                                  the artifact.
+ *                   - deletions:   An array of objects with the deleted artifacts. Each object specifies the artifact
+ *                                  filename and the suffix.
+ *                   - migrations:  An array of objects with the changed (migrated) artifacts. Each object specifies the
+ *                                  artifact filename, the suffix, and the changeset (an array of changes, each specifying
+ *                                  whether it incurs potential data loss, and its respective SQL statement(s), with
+ *                                  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 = {}) {
+  if (!baseModel.isBetaEnabled(options, 'to.mtx'))
+    throw new Error('to.mtx is only available with beta flag `to.mtx`');
+
+  const internalOptions = prepareOptions.to.sql(options);
+  // TODO: Use compiler.compileSources() when this function is moved to lib/main.js
+  const merged = toCsn.compactModel(compiler.compileSourcesX({ 'base.csn': csn, 'delta.csn': deltaCsn }), options);
+  const baseSql = forSql(csn, options);
+  const mergedSql = forSql(merged, options);
+  const diff = modelCompare.compareModels(baseSql, mergedSql, options);
+  // Delete artifacts that are already present in csn
+  Object.keys(baseSql.definitions).forEach((artifactName) => {
+    if (diff.definitions[artifactName]) // don't render again, but need info for primary key extension
+      diff.definitions[artifactName]['@cds.persistence.skip'] = true;
+  });
+
+  internalOptions.forHana = true;
+  internalOptions.beta.sqlExtensions = true;
+  const { deletions, migrations, ...additions } = toSql.toSqlDdl(diff, internalOptions);
+
+  return {
+    additions: createSqlDefinitions(additions, mergedSql),
+    deletions: createSqlDeletions(deletions, baseSql),
+    migrations: createSqlMigrations(migrations, mergedSql),
+  };
+}
+
 /**
  * Process the given CSN into HDI artifacts.
  *
@@ -357,49 +401,55 @@ function hdiMigration(csn, options, beforeImage) {
 
   return {
     afterImage,
-    definitions: createDefinitions(),
-    deletions: createDeletions(),
-    migrations: createMigrations(),
+    definitions: createSqlDefinitions(hdbkinds, afterImage),
+    deletions: createSqlDeletions(deletions, beforeImage),
+    migrations: createSqlMigrations(migrations, afterImage),
   };
+}
 
-  /**
-   * From the given HDI artifacts, create the the correct result structure.
-   *
-   * @returns {object[]} Array of objects, each having: name, suffix and sql
-   */
-  function createDefinitions() {
-    const result = [];
-    forEach(hdbkinds, (kind, artifacts) => {
-      const suffix = `.${ kind }`;
-      forEach(artifacts, (name, sqlStatement) => {
-        if ( kind !== 'hdbindex' )
-          result.push({ name: getFileName(name, afterImage), suffix, sql: sqlStatement });
-        else
-          result.push({ name, suffix, sql: sqlStatement });
-      });
+/**
+ * From the given SQLs, create the correct result structure.
+ *
+ * @param {object} hdbkinds Object of hdbkinds (such as `hdbindex`) mapped to dictionary of artifacts.
+ * @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) {
+  const result = [];
+  forEach(hdbkinds, (kind, artifacts) => {
+    const suffix = `.${ kind }`;
+    forEach(artifacts, (name, sqlStatement) => {
+      if ( kind !== 'hdbindex' )
+        result.push({ name: getFileName(name, afterImage), suffix, sql: sqlStatement });
+      else
+        result.push({ name, suffix, sql: sqlStatement });
     });
-    return result;
-  }
-  /**
-   * From the given deletions, create the correct result structure.
-   *
-   * @returns {object[]} Array of objects, each having: name and suffix - only .hdbtable as suffix for now
-   */
-  function createDeletions() {
-    const result = [];
-    forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' }));
-    return result;
-  }
-  /**
-   * From the given migrations, create the correct result structure.
-   *
-   * @returns {object[]} Array of objects, each having: name, suffix and changeset.
-   */
-  function createMigrations() {
-    const result = [];
-    forEach(migrations, (name, changeset) => result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset }));
-    return result;
-  }
+  });
+  return result;
+}
+/**
+ * From the given deletions, create the correct result structure.
+ *
+ * @param {object} deletions Dictionary of deletions, only keys are used.
+ * @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) {
+  const result = [];
+  forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' }));
+  return result;
+}
+/**
+ * From the given migrations, create the correct result structure.
+ *
+ * @param {object} migrations Dictionary of changesets (migrations).
+ * @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) {
+  const result = [];
+  forEach(migrations, (name, changeset) => result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset }));
+  return result;
 }
 
 hdi.migration = hdiMigration;
@@ -649,6 +699,8 @@ module.exports = {
   for_sql: publishCsnProcessor(forSql, 'for.sql'),
   for_hdi: publishCsnProcessor(forHdi, 'for.hdi'),
   for_hdbcds: publishCsnProcessor(forHdbcds, 'for.hdbcds'),
+  /** beta - WIP */
+  mtx: publishCsnProcessor(mtx, 'to.mtx'),
   /** Deprecated, will be removed in cds-compiler@v4 */
   preparedCsnToEdmx,
   preparedCsnToEdm,

package/lib/api/options.js

@@ -57,9 +57,7 @@ const privateOptions = [
   'noRecompile',
   'internalMsg',
   'disableHanaComments',      // in case of issues with hana comment rendering
-  'dependentAutoexposed',     // deprecated, no effect - TODO: safe to remove?
-  'longAutoexposed',          // deprecated, no effect - TODO: safe to remove?
-  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback',
+  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v4): Remove option
 ];
 
 const overallOptions = publicOptionsNewAPI.concat(privateOptions);
@@ -159,6 +157,7 @@ module.exports = {
       return translateOptions(options, defaultOptions, hardOptions, undefined, undefined, 'for.hana');
     },
   },
+  overallOptions, // exported for testing
 };