angular-odata 0.159.0 → 0.161.0

package/fesm2022/angular-odata.mjs

@@ -1779,11 +1779,13 @@ class ODataAnnotation {
     string;
     bool;
     int;
-    permissions;
-    properties;
+    values;
     constructor(annot) {
         this.term = annot.term;
-        Object.assign(this, annot);
+        this.string = annot.string;
+        this.bool = annot.bool;
+        this.int = annot.int;
+        this.values = annot.values;
     }
 }
 class ODataAnnotatable {
@@ -1813,8 +1815,7 @@ class ODataAnnotatable {
         return (annot.string ||
             annot.bool ||
             annot.int ||
-            annot.permissions ||
-            annot.properties);
+            annot.values);
     }
 }
 
@@ -2152,9 +2153,9 @@ class ODataEnumTypeParser extends ODataAnnotatable {
         }
         return schema;
     }
-    validate(value, { method, navigation = false, } = {}) {
+    validate(value, { method, navigation = false, }) {
         if (this.flags) {
-            let fields = this.fields(value);
+            const fields = this.fields(value);
             return value && fields.length === 0 ? ['mismatch'] : undefined;
         }
         else {
@@ -2194,6 +2195,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     navigation;
     nullable;
     default;
+    optimisticConcurrency = false;
     maxLength;
     precision;
     scale;
@@ -2214,7 +2216,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         this.precision = field.precision;
         this.scale = field.scale;
     }
-    validate(value, { method, navigation = false, } = {}) {
+    validate(value, { method, navigation = false, }) {
         let errors;
         if (this.collection && Array.isArray(value)) {
             errors = value.map((v) => this.validate(v, { method, navigation }));
@@ -2230,12 +2232,8 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         }
         else {
             // IsEdmType
-            const computed = this.annotatedValue(COMPUTED);
             errors = [];
-            if (!this.nullable &&
-                (value === null || (value === undefined && method !== 'modify')) && // Is null or undefined without patch?
-                !(computed && method === 'create') // Not (Is Computed field and create) ?
-            ) {
+            if (method !== 'modify' && value == null && !(this.nullable || this.isComputed())) {
                 errors.push(`required`);
             }
             if (this.maxLength !== undefined &&
@@ -2303,12 +2301,13 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         });
     }
     //#endregion
-    configure({ options, parserForType, }) {
+    configure({ options, optimisticConcurrency, parserForType, }) {
         this.parserOptions = options;
         this.parser = parserForType(this.type);
-        if (this.default !== undefined) {
+        if (optimisticConcurrency !== undefined)
+            this.optimisticConcurrency = optimisticConcurrency;
+        if (this.default !== undefined)
             this.default = this.deserialize(this.default, options);
-        }
     }
     //#region Json Schema
     // https://json-schema.org/
@@ -2385,6 +2384,12 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     isKey() {
         return this.structured.keys({ include_parents: true }).some((k) => k.name === this.name);
     }
+    isComputed() {
+        return this.annotatedValue(COMPUTED);
+    }
+    isOptimisticConcurrency() {
+        return this.optimisticConcurrency;
+    }
     hasReferentials() {
         return this.referentials.length !== 0;
     }
@@ -2517,14 +2522,18 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         const parserOptions = { ...this.parserOptions, ...options };
         return raw(JSON.stringify(this.serialize(value, parserOptions)));
     }
-    configure({ options, parserForType, }) {
+    configure({ options, entitySet, parserForType, }) {
         this.parserOptions = options;
         if (this.base !== undefined) {
             this.parent = parserForType(this.base);
             if (this.parent !== undefined)
                 this.parent.children.push(this);
         }
-        this._fields.forEach((f) => f.configure({ options, parserForType }));
+        const optimisticConcurrencyFields = entitySet?.annotatedValue(OPTIMISTIC_CONCURRENCY) ?? [];
+        this._fields.forEach((field) => {
+            const optimisticConcurrency = optimisticConcurrencyFields.indexOf(field.name) !== -1;
+            field.configure({ options, optimisticConcurrency, parserForType });
+        });
     }
     /**
      * Returns all fields of the structured type.
@@ -2676,7 +2685,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         }
         return schema;
     }
-    validate(attrs, { method, navigation = false, } = {}) {
+    validate(attrs, { method, navigation = false, }) {
         const errors = {};
         const fields = this.fields({
             include_navigation: true,
@@ -2994,8 +3003,10 @@ class ODataStructuredType extends ODataParserSchemaElement {
             if (this.parent !== undefined)
                 this.parent.children.push(this);
         }
+        const entitySet = this.api.findEntitySetForEntityType(this.type()) ?? this.api.findEntitySetForEntityType(this.type({ alias: true }));
         this.parser.configure({
             options,
+            entitySet,
             parserForType: (t) => this.api.parserForType(t),
         });
         if (this.model !== undefined) {
@@ -3179,7 +3190,7 @@ class ODataStructuredType extends ODataParserSchemaElement {
      * @param method Method to use for the process validation
      * @returns Object with the errors
      */
-    validate(attrs, { method, navigation = false, } = {}) {
+    validate(attrs, { method, navigation = false, }) {
         return this.parser.validate(attrs, { method, navigation });
     }
 }
@@ -5987,7 +5998,8 @@ class ODataRequest {
         if (apiOptions.prefer?.maxPageSize !== undefined && ['GET'].indexOf(this._method) !== -1)
             prefer.push(`odata.maxpagesize=${apiOptions.prefer?.maxPageSize}`);
         // Annotations
-        if (apiOptions.prefer?.includeAnnotations !== undefined && ['GET'].indexOf(this._method) !== -1)
+        if (apiOptions.prefer?.includeAnnotations !== undefined &&
+            ['GET'].indexOf(this._method) !== -1)
             prefer.push(`odata.include-annotations=${apiOptions.prefer?.includeAnnotations}`);
         // Omit Null Values
         if (apiOptions.prefer?.omitNullValues === true && ['GET'].indexOf(this._method) !== -1)
@@ -7985,11 +7997,22 @@ class CsdlAnnotation {
         return json;
     }
     toConfig() {
+        var items = undefined;
+        if (Array.isArray(this.Collection) && this.Collection.length > 0) {
+            items = this.Collection.map((m) => m.toConfig()).flat();
+        }
+        else if (Array.isArray(this.Record) && this.Record.length > 0) {
+            items = this.Record.map((m) => m.toConfig()).flat();
+        }
+        else if (Array.isArray(this.EnumMember) && this.EnumMember.length > 0) {
+            items = this.EnumMember.map((m) => m.toConfig());
+        }
         return {
             term: this.Term,
             string: this.String,
             bool: this.Bool,
             int: this.Int,
+            values: items,
         };
     }
 }
@@ -8089,6 +8112,21 @@ class CsdlCollection {
         }
         return json;
     }
+    toConfig() {
+        if (Array.isArray(this.String) && this.String.length > 0) {
+            return this.String.map((s) => s.toConfig());
+        }
+        if (Array.isArray(this.Record) && this.Record.length > 0) {
+            return this.Record.map((r) => r.toConfig()).flat();
+        }
+        if (Array.isArray(this.PropertyPath) && this.PropertyPath.length > 0) {
+            return this.PropertyPath.map((p) => p.toConfig());
+        }
+        if (Array.isArray(this.NavigationPropertyPath) && this.NavigationPropertyPath.length > 0) {
+            return this.NavigationPropertyPath.map((p) => p.toConfig());
+        }
+        return [];
+    }
 }
 class CsdlRecord {
     PropertyValue;
@@ -8102,6 +8140,12 @@ class CsdlRecord {
         }
         return json;
     }
+    toConfig() {
+        if (Array.isArray(this.PropertyValue) && this.PropertyValue.length > 0) {
+            return this.PropertyValue.map((p) => p.toConfig());
+        }
+        return [];
+    }
 }
 class CsdlPropertyValue {
     Name;
@@ -8127,6 +8171,19 @@ class CsdlPropertyValue {
         }
         return json;
     }
+    toConfig() {
+        const config = { name: this.Name };
+        if (this.String !== undefined) {
+            config['string'] = this.String;
+        }
+        if (this.Date !== undefined) {
+            config['date'] = this.Date;
+        }
+        if (Array.isArray(this.EnumMember) && this.EnumMember.length > 0) {
+            config['enumMembers'] = this.EnumMember.map((m) => m.toConfig());
+        }
+        return config;
+    }
 }
 class CsdlEnumMember {
     TextContent;
@@ -8138,6 +8195,9 @@ class CsdlEnumMember {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 class CsdlString {
     TextContent;
@@ -8149,6 +8209,9 @@ class CsdlString {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 class CsdlPropertyPath {
     TextContent;
@@ -8160,6 +8223,9 @@ class CsdlPropertyPath {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 class CsdlNavigationPropertyPath {
     TextContent;
@@ -8171,6 +8237,9 @@ class CsdlNavigationPropertyPath {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 
 class CsdlReference extends CsdlAnnotable {
@@ -9085,7 +9154,7 @@ class CsdlSchema {
         return {
             namespace: this.Namespace,
             alias: base?.alias ?? this.Alias,
-            annotations: this.Annotations?.map((t) => t.toConfig()),
+            annotations: this.Annotations?.flatMap((t) => t.toConfig()),
             enums: this.EnumType?.map((t) => t.toConfig(base?.enums?.find((cs) => cs.name === t.Name))),
             entities: [
                 ...(this.ComplexType ?? []).map((t) => t.toConfig(base?.entities?.find((cs) => cs.name === t.Name))),
@@ -10691,7 +10760,7 @@ class ODataCollection {
     }
     create(attrs = {}, { silent = false, server = true } = {}) {
         const model = this.modelFactory(attrs);
-        return (model.isValid() && server ? model.save() : of(model)).pipe(switchMap((model) => this.add(model, { silent, server })), map(() => model));
+        return (model.isValid({ method: 'create' }) && server ? model.save() : of(model)).pipe(switchMap((model) => this.add(model, { silent, server })), map(() => model));
     }
     set(path, value, {}) {
         const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
@@ -11145,10 +11214,10 @@ class ODataModel {
     }
     // Validation
     _errors;
-    validate({ method, navigation = false, } = {}) {
+    validate({ method, navigation = false, }) {
         return this._meta.validate(this, { method, navigation });
     }
-    isValid({ method, navigation = false, } = {}) {
+    isValid({ method, navigation = false, }) {
         this._errors = this.validate({ method, navigation });
         if (this._errors !== undefined)
             this.events$.trigger(ODataModelEventType.Invalid, {
@@ -11750,9 +11819,6 @@ class ODataModelField {
     parser;
     options;
     default;
-    required;
-    concurrency;
-    maxLength;
     minLength;
     min;
     max;
@@ -11764,9 +11830,6 @@ class ODataModelField {
         this.field = field;
         this.parser = parser;
         this.default = opts.default || parser.default;
-        this.required = Boolean(opts.required || !parser.nullable);
-        this.concurrency = Boolean(opts.concurrency);
-        this.maxLength = opts.maxLength || parser.maxLength;
         this.minLength = opts.minLength;
         this.min = opts.min;
         this.max = opts.max;
@@ -11784,16 +11847,20 @@ class ODataModelField {
     annotatedValue(term) {
         return this.parser.annotatedValue(term);
     }
-    configure({ concurrency, options }) {
+    configure({ options }) {
         this.parserOptions = options;
-        if (concurrency)
-            this.concurrency = concurrency;
         if (this.default !== undefined)
             this.default = this.deserialize(this.default, options);
     }
     isKey() {
         return this.parser.isKey();
     }
+    isComputed() {
+        return this.parser.isComputed();
+    }
+    isOptimisticConcurrency() {
+        return this.parser.isOptimisticConcurrency();
+    }
     hasReferentials() {
         return this.parser.hasReferentials();
     }
@@ -11823,7 +11890,7 @@ class ODataModelField {
             throw new Error(`Could not find enum type for ${this.parser.type}`);
         return enumType;
     }
-    validate(value, { method, navigation = false, } = {}) {
+    validate(value, { method, navigation = false, }) {
         if (ODataModelOptions.isModel(value)) {
             return !value.isValid({ method, navigation }) ? value._errors : undefined;
         }
@@ -11833,21 +11900,7 @@ class ODataModelField {
                 : undefined;
         }
         else {
-            const computed = this.annotatedValue(COMPUTED);
             const errors = this.parser?.validate(value, { method, navigation }) ?? [];
-            if (this.required &&
-                (value === null || (value === undefined && method !== 'modify')) && // Is null or undefined without patch?
-                !(computed && method === 'create') // Not (Is Computed field and create) ?
-            ) {
-                if (errors.indexOf('required') === -1)
-                    errors.push(`required`);
-            }
-            if (this.maxLength !== undefined &&
-                typeof value === 'string' &&
-                value.length > this.maxLength) {
-                if (errors.indexOf('maxlength') === -1)
-                    errors.push(`maxlength`);
-            }
             if (this.minLength !== undefined &&
                 typeof value === 'string' &&
                 value.length < this.minLength) {
@@ -11951,11 +12004,11 @@ class ODataModelAttribute {
     get navigation() {
         return this._field.navigation;
     }
-    get computed() {
-        return this._field.annotatedValue(COMPUTED);
+    isComputed() {
+        return this._field.isComputed();
     }
-    get concurrency() {
-        return Boolean(this._field.concurrency);
+    isOptimisticConcurrency() {
+        return this._field.isOptimisticConcurrency();
     }
     get referentials() {
         return this._field.referentials;
@@ -12125,17 +12178,7 @@ class ODataModelOptions {
                 this.parent.children.push(this);
         }
         this.entitySet = this.api.findEntitySetForEntityType(this.type());
-        let concurrencyFields = [];
-        if (this.entitySet !== undefined) {
-            concurrencyFields = this.entitySet.annotatedValue(OPTIMISTIC_CONCURRENCY) ?? [];
-        }
-        this._fields.forEach((field) => {
-            const concurrency = concurrencyFields.indexOf(field.field) !== -1;
-            field.configure({
-                concurrency,
-                options,
-            });
-        });
+        this._fields.forEach((field) => field.configure({ options, }));
     }
     fields({ include_navigation, include_parents, }) {
         return [
@@ -12193,8 +12236,7 @@ class ODataModelOptions {
             parser: structuredFieldParser,
         });
         modelField.configure({
-            options: this.api.options,
-            concurrency: false,
+            options: this.api.options
         });
         Object.defineProperty(self, modelField.name, {
             configurable: true,
@@ -12391,7 +12433,7 @@ class ODataModelOptions {
             return null;
         return resolve ? Objects.resolveKey(referenced, { single }) : Object.fromEntries(referenced);
     }
-    validate(self, { method, navigation = false, } = {}) {
+    validate(self, { method, navigation = false, }) {
         const errors = this.fields({
             include_parents: true,
             include_navigation: navigation,
@@ -12458,9 +12500,9 @@ class ODataModelOptions {
             .reduce((acc, attr) => {
             const name = field_mapping ? attr.fieldName : attr.name;
             let value = attr.get();
-            const computed = attr.computed;
+            const computed = attr.isComputed();
             const navigation = attr.navigation;
-            const concurrency = attr.concurrency;
+            const concurrency = attr.isOptimisticConcurrency();
             if (ODataModelOptions.isModel(value)) {
                 value = value.toEntity({
                     client_id,
@@ -12977,7 +13019,7 @@ class ODataApi {
         });
         return true;
     }
-    populate({ schemas, references, models, collections, }) {
+    populate({ schemas, references, models, collections }) {
         const odataSchemas = (schemas ?? []).map((schema) => new ODataSchema(schema, this));
         //TODO: Merge duplicates
         this.schemas = [...this.schemas, ...odataSchemas];