Fixed model name parsing from OData name

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [3.13.0-beta.1] - 2024-06-03
+### Fixed
+- Model name parsing from OData name.
+
 ## [3.12.0] - 2024-05-03
 ### Changed
 - Increase version to match ember-flexberry.

addon/adapters/odata.js

@@ -11,7 +11,7 @@ import { A, isArray } from '@ember/array';
 
 import SnapshotTransform from '../utils/snapshot-transform';
 import ODataQueryAdapter from '../query/odata-adapter';
-import { capitalize, camelize, dasherize, odataPluralize, odataSingularize } from '../utils/string-functions';
+import { capitalize, camelize, odataDasherize, odataPluralize, odataSingularize } from '../utils/string-functions';
 import isUUID from '../utils/is-uuid';
 import generateUniqueId from '../utils/generate-unique-id';
 import { getResponseMeta, getBatchResponses, parseBatchResponse } from '../utils/batch-queries';
@@ -705,7 +705,7 @@ export default DS.RESTAdapter.extend({
  getModelNameFromOdataContext(context) {
  const regex = /(?<=\$metadata#)\w*(?=[\(\/])/g;
 
- return odataSingularize(dasherize(regex.exec(context)[0]));
+ return odataSingularize(odataDasherize(regex.exec(context)[0]));
  },
 
  /**

addon/serializers/base.js

@@ -1,6 +1,6 @@
 import { merge } from '@ember/polyfills';
 import DS from 'ember-data';
-import { capitalize, camelize, dasherize, odataPluralize, odataSingularize } from '../utils/string-functions';
+import { capitalize, camelize, odataDasherize, odataPluralize, odataSingularize } from '../utils/string-functions';
 
 /**
  * Base serializer class.
@@ -192,10 +192,10 @@ export default DS.RESTSerializer.extend({
  */
  modelNameFromPayloadKey(key) {
  if (key.startsWith('#.')) {
- return dasherize(key.replace(/[#\.]/g, ''));
+ return odataDasherize(key.replace(/[#\.]/g, ''));
  }
 
- return odataSingularize(dasherize(key.replace(/[#\.]/g, '')));
+ return odataSingularize(odataDasherize(key.replace(/[#\.]/g, '')));
  },
 
  /**

addon/utils/string-functions.js

@@ -18,6 +18,7 @@ const STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
 const STRING_CAPITALIZE_REGEXP = (/(^|\/)([a-zа-яё])/g);
 
 const STRING_DECAMELIZE_REGEXP = (/([a-zа-яё\d])([A-ZА-ЯЁ])/g);
+const ODATA_DECAMELIZE_REGEXP = (/([A-ZА-ЯЁa-zа-яё\d])(?=[A-ZА-ЯЁ])/g);
 /* eslint-enable no-useless-escape */
 
 /**
@@ -161,6 +162,18 @@ function odataPluralize(str) {
  return str + 's';
 }
 
+/**
+ Returns the dasheraized form of a string for parsing OData to model name
+
+ @method odataDasherize
+ @param {String} str The string to dasherize.
+ @return {String} The dasherized string.
+*/
+function odataDasherize(str) {
+ let decamelizedStr = str.replace(ODATA_DECAMELIZE_REGEXP, '$1_').toLowerCase();
+ return decamelizedStr.replace(STRING_DASHERIZE_REGEXP, '-');
+}
+
 export {
  decamelize,
  dasherize,
@@ -169,5 +182,6 @@ export {
  underscore,
  capitalize,
  odataSingularize,
- odataPluralize
+ odataPluralize,
+ odataDasherize
 };

package.json

@@ -1,6 +1,6 @@
 {
  "name": "ember-flexberry-data",
- "version": "3.12.0",
+ "version": "3.13.0-beta.1",
  "description": "Support of database projections, JavaScript Query Language and working with several kinds of backends",
  "keywords": [
  "ember-addon",

vendor/ember-flexberry-data/register-version.js

@@ -1,3 +1,3 @@
 /* globals Ember */
-var version = '3.12.0';
+var version = '3.13.0-beta.1';
 Ember.libraries.register('Ember Flexberry Data', version);