angular-odata 0.142.0 → 0.144.0

package/README.md

@@ -8,7 +8,7 @@
 <p align="center">
   <a href="CONTRIBUTING.md">Contributing</a>
   ·
-  <a href="./docs/README.md">Documentation</a>
+  <a href="./docs/api/index.html">Documentation</a>
   ·
   <a href="https://github.com/diegomvh/AngularODataEntity">Demo</a>
   <br>

package/fesm2022/angular-odata.mjs

@@ -107,16 +107,16 @@ var EdmType;
     //Edm.GeometryCollection Collection of arbitrary Geometry values
     EdmType["GeometryCollection"] = "Edm.GeometryCollection";
 })(EdmType || (EdmType = {}));
-var JsonType;
-(function (JsonType) {
-    JsonType["string"] = "string";
-    JsonType["number"] = "number";
-    JsonType["integer"] = "integer";
-    JsonType["object"] = "object";
-    JsonType["array"] = "array";
-    JsonType["boolean"] = "boolean";
-    JsonType["null"] = "null";
-})(JsonType || (JsonType = {}));
+var JsonSchemaType;
+(function (JsonSchemaType) {
+    JsonSchemaType["string"] = "string";
+    JsonSchemaType["number"] = "number";
+    JsonSchemaType["integer"] = "integer";
+    JsonSchemaType["object"] = "object";
+    JsonSchemaType["array"] = "array";
+    JsonSchemaType["boolean"] = "boolean";
+    JsonSchemaType["null"] = "null";
+})(JsonSchemaType || (JsonSchemaType = {}));
 const NONE_PARSER = {
     deserialize: (value) => value,
     serialize: (value) => value,
@@ -1168,7 +1168,7 @@ const Durations = {
             v.months ? v.months + 'M' : '',
             v.weeks ? v.weeks + 'W' : '',
             v.days ? v.days + 'D' : '',
-            'T',
+            (v.hours || v.minutes || v.seconds) ? 'T' : '',
             v.hours ? v.hours + 'H' : '',
             v.minutes ? v.minutes + 'M' : '',
             v.seconds ? v.seconds + 'S' : '',
@@ -2131,19 +2131,23 @@ class ODataEnumTypeParser extends ODataAnnotatable {
         return parserOptions?.stringAsEnum ? raw(`'${serialized}'`) : raw(serialized);
     }
     // Json Schema
-    toJsonSchema() {
-        return this.flags
+    toJsonSchema(options, parent) {
+        let schema = (this.flags
             ? {
                 title: this.name,
-                type: JsonType.array,
+                type: JsonSchemaType.array,
                 items: {
-                    type: JsonType.integer,
+                    type: JsonSchemaType.integer,
                 },
             }
             : {
-                type: JsonType.integer,
+                type: JsonSchemaType.integer,
                 enum: this._fields.map((f) => f.value),
-            };
+            });
+        if (options?.map !== undefined) {
+            schema = options.map(schema, parent);
+        }
+        return schema;
     }
     validate(value, { method, navigation = false, } = {}) {
         if (this.flags) {
@@ -2305,39 +2309,39 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     }
     //#region Json Schema
     // https://json-schema.org/
-    toJsonSchema(options = {}) {
+    toJsonSchema(options, parent) {
         let schema = this.parser instanceof ODataStructuredTypeFieldParser ||
             this.parser instanceof ODataStructuredTypeParser ||
             this.parser instanceof ODataEnumTypeParser
-            ? this.parser.toJsonSchema(options)
-            : { title: this.name, type: JsonType.object };
+            ? this.parser.toJsonSchema(options, parent)
+            : { title: this.name };
         switch (this.type) {
             case EdmType.String:
-                schema.type = JsonType.string;
+                schema.type = JsonSchemaType.string;
                 break;
             case EdmType.Guid:
-                schema.type = JsonType.string;
+                schema.type = JsonSchemaType.string;
                 schema.pattern =
                     '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$';
                 break;
             case EdmType.Binary:
-                schema.type = JsonType.string;
+                schema.type = JsonSchemaType.string;
                 schema.contentEncoding = 'base64';
                 break;
             case EdmType.Date:
-                schema.type = JsonType.string;
+                schema.type = JsonSchemaType.string;
                 schema.format = 'date';
                 break;
             case EdmType.TimeOfDay:
-                schema.type = JsonType.string;
+                schema.type = JsonSchemaType.string;
                 schema.format = 'time';
                 break;
             case EdmType.DateTimeOffset:
-                schema.type = JsonType.string;
+                schema.type = JsonSchemaType.string;
                 schema.format = 'date-time';
                 break;
             case EdmType.Duration:
-                schema.type = JsonType.string;
+                schema.type = JsonSchemaType.string;
                 schema.format = 'duration';
                 break;
             case EdmType.Byte:
@@ -2346,15 +2350,15 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
             case EdmType.Int32:
             case EdmType.Int64:
                 //TODO: Range
-                schema.type = JsonType.integer;
+                schema.type = JsonSchemaType.integer;
                 break;
             case EdmType.Single:
             case EdmType.Double:
             case EdmType.Decimal:
-                schema.type = JsonType.number;
+                schema.type = JsonSchemaType.number;
                 break;
             case EdmType.Boolean:
-                schema.type = JsonType.boolean;
+                schema.type = JsonSchemaType.boolean;
                 break;
         }
         if (this.maxLength)
@@ -2362,13 +2366,16 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         if (this.default)
             schema.default = this.default;
         if (this.nullable)
-            schema.type = [schema.type, JsonType.null];
+            schema.type = [schema.type, JsonSchemaType.null];
         if (this.collection)
             schema = {
-                type: JsonType.array,
+                type: JsonSchemaType.array,
                 items: schema,
                 additionalItems: false,
             };
+        if (options?.map !== undefined) {
+            schema = options.map(schema, parent);
+        }
         return schema;
     }
     //#endregion
@@ -2627,40 +2634,43 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         };
     }
     // Json Schema
-    toJsonSchema(options = {}) {
+    toJsonSchema(options, parent) {
         let schema = {
             $schema: 'http://json-schema.org/draft-07/schema#',
             $id: `${this.namespace}.${this.name}`,
             title: this.titleize(DESCRIPTION),
             description: this.annotatedValue(LONG_DESCRIPTION),
-            type: JsonType.object,
+            type: JsonSchemaType.object,
             properties: {},
             required: [],
         };
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
-        }).filter((f) => (!f.navigation || (options.expand && f.name in options.expand)) &&
-            (!options.select || options.select.indexOf(f.name) !== -1));
-        schema.properties = Object.assign({}, schema.properties, fields
-            .map((f) => {
-            let expand = options.expand && f.name in options.expand
-                ? options.expand[f.name]
-                : undefined;
-            let schema = f.toJsonSchema(expand);
-            if (options.custom && f.name in options.custom)
-                schema = options.custom[f.name](schema, f);
-            return { [f.name]: schema };
-        })
-            .reduce((acc, v) => Object.assign(acc, v), {}));
+        }).filter((f) => (!f.navigation || (options?.expand && f.name in options?.expand)) &&
+            (!options?.select || (options?.select).indexOf(f.name) !== -1));
         schema.required = [
-            ...schema.required,
+            ...(schema.required ?? []),
             ...fields
-                .filter((f) => options.required && f.name in options.required
-                ? options.required[f.name]
+                .filter((f) => options?.required && f.name in options?.required
+                ? options?.required[f.name]
                 : !f.nullable)
                 .map((f) => f.name),
         ];
+        schema.properties = Object.assign({}, schema.properties, fields
+            .map((f) => {
+            let expand = options?.expand && f.name in options?.expand
+                ? (options?.expand)[f.name]
+                : undefined;
+            let child = f.toJsonSchema({ ...expand, map: options?.map }, schema);
+            if (options?.custom && f.name in options?.custom)
+                child = (options?.custom[f.name])(child, f);
+            return { [f.name]: child };
+        })
+            .reduce((acc, v) => Object.assign(acc, v), {}));
+        if (options?.map !== undefined) {
+            schema = options.map(schema, parent);
+        }
         return schema;
     }
     validate(attrs, { method, navigation = false, } = {}) {
@@ -3157,7 +3167,7 @@ class ODataStructuredType extends ODataParserSchemaElement {
      * @param options Options for json schema
      * @returns Json Schema
      */
-    toJsonSchema(options = {}) {
+    toJsonSchema(options) {
         return this.parser.toJsonSchema(options);
     }
     /**
@@ -12000,6 +12010,9 @@ class ODataModelOptions {
     isTypeOf(type) {
         return this.structuredType.type() === type;
     }
+    toJsonSchema(options) {
+        return this.structuredType.toJsonSchema(options);
+    }
     isModelFor(entity) {
         // Resolve By Type
         const type = this.api.options.helper.type(entity);
@@ -14148,5 +14161,5 @@ class ODataInStorageCache extends ODataBaseCache {
  * Generated bundle index. Do not edit.
  */
 
-export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataLoader, ODataMetadataParser, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataOperators, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataSyntax, ODataTransformations, ODataValueResource, Objects, Operator, OrderByExpression, OrderByField, PathSegment, QueryCustomTypes, QueryOption, RenderableFactory, SearchExpression, SearchTerm, SegmentHandler, SelectExpression, StandardAggregateMethods, StringAndCollectionFunctions, StringFunctions, Strings, Transformations, Type, TypeFunctions, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, syntax, transformations };
+export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonSchemaType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataLoader, ODataMetadataParser, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataOperators, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataSyntax, ODataTransformations, ODataValueResource, Objects, Operator, OrderByExpression, OrderByField, PathSegment, QueryCustomTypes, QueryOption, RenderableFactory, SearchExpression, SearchTerm, SegmentHandler, SelectExpression, StandardAggregateMethods, StringAndCollectionFunctions, StringFunctions, Strings, Transformations, Type, TypeFunctions, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, syntax, transformations };
 //# sourceMappingURL=angular-odata.mjs.map