angular-odata 0.99.0 → 0.99.2

package/fesm2020/angular-odata.mjs

@@ -2969,7 +2969,7 @@ class ODataSchemaElement extends ODataAnnotatable {
         return names.indexOf(type) !== -1;
     }
     /**
-     * Returns a boolean indicating if the structured type is a sub type of the given type.
+     * Returns a boolean indicating if the structured type is a subtype of the given type.
      * @param type String representation of the type
      * @returns True if the callable is type of the given type
      */
@@ -2978,6 +2978,16 @@ class ODataSchemaElement extends ODataAnnotatable {
             return true;
         return false;
     }
+    /**
+     * Returns a boolean indicating if the structured type is a supertype of the given type.
+     * @param type String representation of the type
+     * @returns True if the callable is type of the given type
+     */
+    isSupertypeOf(schema) {
+        if (this.isTypeOf(schema.type()))
+            return true;
+        return false;
+    }
 }
 
 //https://github.com/niklasvh/base64-arraybuffer
@@ -4209,7 +4219,7 @@ class ODataStructuredType extends ODataSchemaElement {
         }
     }
     /**
-     * Returns a boolean indicating if the structured type is a sub type of the given type.
+     * Returns a boolean indicating if the structured type is a subtype of the given type.
      * @param type String representation of the type
      * @returns True if the callable is type of the given type
      */
@@ -4217,6 +4227,15 @@ class ODataStructuredType extends ODataSchemaElement {
         return (super.isSubtypeOf(schema) ||
             (this.parent !== undefined && this.parent.isSubtypeOf(schema)));
     }
+    /**
+     * Returns a boolean indicating if the structured type is a supertype of the given type.
+     * @param type String representation of the type
+     * @returns True if the callable is type of the given type
+     */
+    isSupertypeOf(schema) {
+        return (super.isSupertypeOf(schema) ||
+            this.children.some((c) => c.isSupertypeOf(schema)));
+    }
     /**
      * Returns a boolean indicating if the structured type has a simple key.
      * @returns True if the structured type has a simple key
@@ -4493,19 +4512,11 @@ class ODataResource {
             other.schema !== undefined &&
             this.schema?.isSubtypeOf(other.schema));
     }
-    /*
-    isParentOf(other: ODataResource<any>) {
-      const [selfPath] = this.pathAndParams();
-      const [otherPath] = other.pathAndParams();
-      return otherPath !== selfPath && otherPath.startsWith(selfPath);
-    }
-  
-    isChildOf(other: ODataResource<any>) {
-      const [selfPath] = this.pathAndParams();
-      const [otherPath] = other.pathAndParams();
-      return otherPath !== selfPath && selfPath.startsWith(otherPath);
+    isSupertypeOf(other) {
+        return (this.schema !== undefined &&
+            other.schema !== undefined &&
+            this.schema?.isSupertypeOf(other.schema));
     }
-    */
     isEqualTo(other, test) {
         const [selfPath, selfParams] = this.pathAndParams();
         const [otherPath, otherParams] = other.pathAndParams();
@@ -4779,6 +4790,9 @@ class ODataActionResource extends ODataResource {
         }
         return action;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     returnType() {
         return this.schema instanceof ODataCallable
@@ -6083,6 +6097,11 @@ class ODataBatchResource extends ODataResource {
         segments.add(PathSegmentNames.batch, $BATCH);
         return new ODataBatchResource(api, { segments });
     }
+    clone() {
+        const batch = super.clone();
+        batch._requests = [...this._requests];
+        return batch;
+    }
     //#endregion
     storeRequester() {
         const current = this.api.request;
@@ -6278,6 +6297,9 @@ class ODataCountResource extends ODataResource {
         query?.keep(QueryOptionNames.filter, QueryOptionNames.search);
         return new ODataCountResource(api, { segments, query });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -6329,6 +6351,9 @@ class ODataFunctionResource extends ODataResource {
         }
         return func;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     returnType() {
         return this.schema instanceof ODataCallable
@@ -6433,6 +6458,9 @@ class ODataMediaResource extends ODataResource {
         segments.add(PathSegmentNames.value, $VALUE);
         return new ODataMediaResource(api, { segments, query });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -6485,6 +6513,9 @@ class ODataValueResource extends ODataResource {
         }
         return value;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -6550,6 +6581,9 @@ class ODataPropertyResource extends ODataResource {
         }
         return property;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const property = this.clone();
@@ -6685,6 +6719,9 @@ class ODataReferenceResource extends ODataResource {
         query?.clear();
         return new ODataReferenceResource(api, { segments, query });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     post(target, options) {
@@ -6812,6 +6849,9 @@ class ODataNavigationPropertyResource extends ODataResource {
         }
         return navigation;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const navigation = this.clone();
@@ -6983,6 +7023,9 @@ class ODataEntityResource extends ODataResource {
         query?.keep(QueryOptionNames.expand, QueryOptionNames.select, QueryOptionNames.format);
         return new ODataEntityResource(api, { segments, query, schema });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const entity = this.clone();
@@ -7083,6 +7126,9 @@ class ODataEntitySetResource extends ODataResource {
             segment.type(schema.type());
         return new ODataEntitySetResource(api, { segments, query, schema });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     entity(key) {
         const entity = ODataEntityResource.factory(this.api, {
@@ -7169,6 +7215,9 @@ class ODataMetadataResource extends ODataResource {
         segments.add(PathSegmentNames.metadata, $METADATA);
         return new ODataMetadataResource(api, segments);
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -7192,6 +7241,9 @@ class ODataSingletonResource extends ODataResource {
             segment.type(schema.type());
         return new ODataSingletonResource(api, { segments, query, schema });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const singleton = this.clone();
@@ -7674,8 +7726,8 @@ class ODataModelOptions {
     attach(self, resource) {
         if (self._resource !== null &&
             resource.type() !== self._resource.type() &&
-            !resource.isSubtypeOf(self._resource))
-            throw new Error(`Can't reattach ${resource.type()} to ${self._resource.type()}`);
+            !self._resource.isSubtypeOf(resource))
+            throw new Error(`Can't attach ${resource.type()} to ${self._resource.type()}`);
         const current = self._resource;
         if (current === null || !current.isEqualTo(resource)) {
             self._resource = resource;
@@ -7702,12 +7754,7 @@ class ODataModelOptions {
     static resource(child) {
         let resource = undefined;
         for (let [model, field] of ODataModelOptions.chain(child)) {
-            resource =
-                resource ||
-                    model._resource ||
-                    (ODataModelOptions.isModel(model)
-                        ? model._meta.modelResourceFactory()
-                        : model._model.meta.collectionResourceFactory());
+            resource = resource || model._resource;
             if (resource === undefined)
                 break;
             if (ODataModelOptions.isModel(model)) {
@@ -7722,7 +7769,7 @@ class ODataModelOptions {
             }
             if (field === null) {
                 const query = model._resource?.cloneQuery().toQueryArguments();
-                if (query !== undefined)
+                if (query !== undefined && resource !== undefined)
                     resource.query((q) => q.apply(query));
                 continue;
             }
@@ -7763,7 +7810,8 @@ class ODataModelOptions {
             self._parent = parent;
         }
         // Resource
-        resource = resource || this.modelResourceFactory();
+        if (self._parent === null && resource === undefined)
+            resource = this.modelResourceFactory();
         if (resource !== undefined) {
             this.attach(self, resource);
         }
@@ -7886,14 +7934,29 @@ class ODataModelOptions {
                     (model != undefined && model.hasChanged({ include_navigation })))));
     }
     asEntity(self, func) {
-        const parent = self._parent;
+        // Build new resource
+        const query = self.resource().cloneQuery();
+        let resource = this.modelResourceFactory(query);
+        if (resource === undefined)
+            throw new Error('Model does not have associated Entity endpoint');
+        // Store parent and resource
+        const store = { parent: self._parent, resource: self._resource };
+        // Replace parent and resource
         self._parent = null;
+        self._resource = resource;
+        // Execute function
         const result = func(self);
         if (result instanceof Observable) {
-            return result.pipe(finalize(() => (self._parent = parent)));
+            return result.pipe(finalize(() => {
+                // Restore parent and resource
+                self._parent = store.parent;
+                self._resource = store.resource;
+            }));
         }
         else {
-            self._parent = parent;
+            // Restore parent and resource
+            self._parent = store.parent;
+            self._resource = store.resource;
             return result;
         }
     }
@@ -8292,7 +8355,8 @@ class ODataCollection {
             this._parent = parent;
         }
         // Resource
-        resource = (resource || this._model.meta.collectionResourceFactory());
+        if (this._parent === null && resource === undefined)
+            resource = this._model.meta.collectionResourceFactory();
         if (resource !== undefined) {
             this.attach(resource);
         }
@@ -8321,8 +8385,8 @@ class ODataCollection {
     attach(resource) {
         if (this._resource !== null &&
             this._resource.type() !== resource.type() &&
-            !resource.isSubtypeOf(this._resource))
-            throw new Error(`Can't reattach ${resource.type()} to ${this._resource.type()}`);
+            !this._resource.isSubtypeOf(resource))
+            throw new Error(`Can't reattach ${this._resource.type()} to ${resource.type()}`);
         this._entries.forEach(({ model }) => {
             const mr = this._model.meta.modelResourceFactory(resource.cloneQuery());
             model.attach(mr);
@@ -8338,14 +8402,29 @@ class ODataCollection {
         }
     }
     asEntitySet(func) {
-        const parent = this._parent;
+        // Build new resource
+        const query = this.resource().cloneQuery();
+        let resource = this._model.meta.collectionResourceFactory(query);
+        if (resource === undefined)
+            throw new Error('Collection does not have associated EntitySet endpoint');
+        // Store parent and resource
+        const store = { parent: this._parent, resource: this._resource };
+        // Replace parent and resource
         this._parent = null;
+        this._resource = resource;
+        // Execute
         const result = func(this);
         if (result instanceof Observable) {
-            return result.pipe(finalize(() => (this._parent = parent)));
+            return result.pipe(finalize(() => {
+                // Restore
+                this._parent = store.parent;
+                this._resource = store.resource;
+            }));
         }
         else {
-            this._parent = parent;
+            // Restore
+            this._parent = store.parent;
+            this._resource = store.resource;
             return result;
         }
     }
@@ -10203,9 +10282,9 @@ class ODataClient {
         return this.request('PUT', resource, addBody(options, body));
     }
 }
-ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataSettings }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataClient, decorators: [{
+ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataSettings }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataClient, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -10461,9 +10540,9 @@ class ODataServiceFactory {
         })(this.client, singletonName, apiNameOrEntityType);
     }
 }
-ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataServiceFactory });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
+ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataServiceFactory });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
@@ -10487,10 +10566,10 @@ class ODataModule {
         };
     }
 }
-ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
-ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [[HttpClientModule]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, decorators: [{
+ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
+ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [[HttpClientModule]] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [HttpClientModule],