@pnp/graph 3.21.0 → 4.0.0-alpha0

package/conversations/types.js

@@ -1,12 +1,11 @@
 import { __decorate } from "tslib";
 import { body } from "@pnp/queryable";
-import { _GraphQueryableCollection, _GraphQueryableInstance, graphInvokableFactory, } from "../graphqueryable.js";
+import { _GraphCollection, _GraphInstance, graphInvokableFactory, graphPost, graphDelete, } from "../graphqueryable.js";
 import { defaultPath, updateable, deleteable, addable, getById } from "../decorators.js";
-import { graphPost, graphDelete } from "../operations.js";
 /**
  * Conversation
  */
-let _Conversation = class _Conversation extends _GraphQueryableInstance {
+let _Conversation = class _Conversation extends _GraphInstance {
     /**
      * Get all the threads in a group conversation.
      */
@@ -23,7 +22,7 @@ export const Conversation = graphInvokableFactory(_Conversation);
 /**
  * Conversations
  */
-let _Conversations = class _Conversations extends _GraphQueryableCollection {
+let _Conversations = class _Conversations extends _GraphCollection {
 };
 _Conversations = __decorate([
     defaultPath("conversations"),
@@ -35,7 +34,7 @@ export const Conversations = graphInvokableFactory(_Conversations);
 /**
  * Thread
  */
-let _Thread = class _Thread extends _GraphQueryableInstance {
+let _Thread = class _Thread extends _GraphInstance {
     /**
      * Get all the threads in a group conversation.
      */
@@ -59,7 +58,7 @@ export const Thread = graphInvokableFactory(_Thread);
 /**
  * Threads
  */
-let _Threads = class _Threads extends _GraphQueryableCollection {
+let _Threads = class _Threads extends _GraphCollection {
 };
 _Threads = __decorate([
     defaultPath("threads"),
@@ -71,7 +70,7 @@ export const Threads = graphInvokableFactory(_Threads);
 /**
  * Post
  */
-let _Post = class _Post extends _GraphQueryableInstance {
+let _Post = class _Post extends _GraphInstance {
     /**
      * Forward a post to a recipient
      */
@@ -95,7 +94,7 @@ export const Post = graphInvokableFactory(_Post);
 /**
  * Posts
  */
-let _Posts = class _Posts extends _GraphQueryableCollection {
+let _Posts = class _Posts extends _GraphCollection {
 };
 _Posts = __decorate([
     defaultPath("posts"),
@@ -107,7 +106,7 @@ export const Posts = graphInvokableFactory(_Posts);
 /**
  * Senders
  */
-export class _Senders extends _GraphQueryableCollection {
+export class _Senders extends _GraphCollection {
     /**
      * Add a new user or group to this senders collection
      * @param id The full @odata.id value to add (ex: https://graph.microsoft.com/v1.0/users/user@contoso.com)

package/conversations/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../packages/graph/conversations/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../packages/graph/conversations/types.ts"],"names":[],"mappings":"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"}

package/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../packages/graph/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAItD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,4BAGM,GAAG,EAAE,KAAG,EAAE;kBAGvB,GAAG,EAAE;MAKrC;AAED;;GAEG;AACH,wBAAgB,UAAU,6BAEoB,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,GAAG,QAAQ,IAAI,CAAC;;MAK9D;AAED,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,6BAEY,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,kBAAe,QAAQ,IAAI,CAAC;;MAO1E;AAED,MAAM,WAAW,mBAAmB;IAChC;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC;AAED;;GAEG;AACH,wBAAgB,UAAU,6BAEoB,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,SAAS,GAAG;;MAK1D;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAChC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,6BAEY,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,SAAS,GAAG;;MAO1D;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,GAAG,GAAG;IACxC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC/C;AAED;;GAEG;AACH,wBAAgB,OAAO,6BAEuB,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;kBAGtB,eAAe,SAAS,GAAG,GAAG,QAAQ,IAAI,CAAC;;MAKvE;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;IACjD;;;;OAIG;IACH,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,4BAEX,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;sBAGlB,eAAe,MAAM,MAAM,GAAG,CAAC;;MAK/D;AACD,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,MAAM;IACzC;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;CACrB"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../packages/graph/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsC,MAAM,qBAAqB,CAAC;AAG1F;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,4BAGM,GAAG,EAAE,KAAG,EAAE;kBAGvB,GAAG,EAAE;MAKrC;AAED;;GAEG;AACH,wBAAgB,UAAU,6BAEoB,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,GAAG,QAAQ,IAAI,CAAC;;MAK9D;AAED,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,6BAEY,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,kBAAe,QAAQ,IAAI,CAAC;;MAO1E;AAED,MAAM,WAAW,mBAAmB;IAChC;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC;AAED;;GAEG;AACH,wBAAgB,UAAU,6BAEoB,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,SAAS,GAAG;;MAK1D;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAChC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,6BAEY,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;qBAGnB,eAAe,SAAS,GAAG;;MAO1D;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,GAAG,GAAG;IACxC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC/C;AAED;;GAEG;AACH,wBAAgB,OAAO,6BAEuB,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;kBAGtB,eAAe,SAAS,GAAG,GAAG,QAAQ,IAAI,CAAC;;MAKvE;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;IACjD;;;;OAIG;IACH,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,4BAEX,GAAG,EAAE,KAAG,EAAE;kBAAV,GAAG,EAAE;sBAGlB,eAAe,MAAM,MAAM,GAAG,CAAC;;MAK/D;AACD,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,MAAM;IACzC;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;CACrB"}

package/decorators.js

@@ -1,4 +1,4 @@
-import { graphDelete, graphPatch, graphPost } from "./operations.js";
+import { graphDelete, graphPatch, graphPost } from "./graphqueryable.js";
 import { body, headers } from "@pnp/queryable";
 /**
  * Decorator used to specify the default path for Queryable objects

package/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../packages/graph/decorators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,IAAY;IAEpC,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YACvB,YAAY,GAAG,IAAW;gBACtB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9E,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU;IACtB,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM;gBACT,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AASD;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAC9B,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM,CAAwB,IAAI,GAAG,GAAG;gBAC3C,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;oBAC7B,UAAU,EAAE,IAAI;iBACnB,CAAC,CAAC,CAAC;YACR,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AASD;;GAEG;AACH,MAAM,UAAU,UAAU;IACtB,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM,CAAwB,KAAU;gBAC3C,OAAO,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACzC,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAWD;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAC9B,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM,CAAwB,KAAU,EAAE,IAAI,GAAG,GAAG;gBACvD,OAAO,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC;oBACxC,UAAU,EAAE,IAAI;iBACnB,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAWD;;GAEG;AACH,MAAM,UAAU,OAAO;IACnB,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,GAAG,CAAwB,KAAU;gBACxC,OAAO,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACxC,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAWD;;GAEG;AACH,MAAM,UAAU,OAAO,CAAI,OAA8B;IACrD,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,OAAO,CAAwB,EAAU;gBAC5C,OAAO,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7B,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../packages/graph/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,IAAY;IAEpC,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YACvB,YAAY,GAAG,IAAW;gBACtB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9E,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU;IACtB,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM;gBACT,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AASD;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAC9B,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM,CAAwB,IAAI,GAAG,GAAG;gBAC3C,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;oBAC7B,UAAU,EAAE,IAAI;iBACnB,CAAC,CAAC,CAAC;YACR,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AASD;;GAEG;AACH,MAAM,UAAU,UAAU;IACtB,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM,CAAwB,KAAU;gBAC3C,OAAO,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACzC,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAWD;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAC9B,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,MAAM,CAAwB,KAAU,EAAE,IAAI,GAAG,GAAG;gBACvD,OAAO,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC;oBACxC,UAAU,EAAE,IAAI;iBACnB,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAWD;;GAEG;AACH,MAAM,UAAU,OAAO;IACnB,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,GAAG,CAAwB,KAAU;gBACxC,OAAO,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACxC,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAWD;;GAEG;AACH,MAAM,UAAU,OAAO,CAAI,OAA8B;IACrD,wDAAwD;IACxD,OAAO,UAAiD,MAAS;QAE7D,OAAO,KAAM,SAAQ,MAAM;YAChB,OAAO,CAAwB,EAAU;gBAC5C,OAAO,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7B,CAAC;SACJ,CAAC;IACN,CAAC,CAAC;AACN,CAAC"}

package/directory-objects/types.d.ts

@@ -1,11 +1,10 @@
-import { _GraphQueryableCollection, _GraphQueryableInstance } from "../graphqueryable.js";
+import { _GraphCollection, _GraphInstance } from "../graphqueryable.js";
 import { DirectoryObject as IDirectoryObjectType } from "@microsoft/microsoft-graph-types";
 import { IGetById, IDeleteable } from "../decorators.js";
-import { IPagedResult } from "../behaviors/paged.js";
 /**
  * Represents a Directory Object entity
  */
-export declare class _DirectoryObject<GetType = IDirectoryObjectType> extends _GraphQueryableInstance<GetType> {
+export declare class _DirectoryObject<GetType = IDirectoryObjectType> extends _GraphInstance<GetType> {
     /**
    * Returns all the groups and directory roles that the specified Directory Object is a member of. The check is transitive
    *
@@ -32,7 +31,7 @@ export declare const DirectoryObject: import("../graphqueryable.js").IGraphInvok
  * Describes a collection of Directory Objects
  *
  */
-export declare class _DirectoryObjects<GetType = IDirectoryObjectType[]> extends _GraphQueryableCollection<GetType> {
+export declare class _DirectoryObjects<GetType = IDirectoryObjectType[]> extends _GraphCollection<GetType> {
     /**
   * Returns the directory objects specified in a list of ids. NOTE: The directory objects returned are the full objects containing all their properties.
   * The $select query option is not available for this operation.
@@ -46,12 +45,6 @@ export declare class _DirectoryObjects<GetType = IDirectoryObjectType[]> extends
      *  If the resource doesn't support count, this value will always be zero
      */
     count(): Promise<number>;
-    /**
-     * Allows reading through a collection as pages of information whose size is determined by top or the api method's default
-     *
-     * @returns an object containing results, the ability to determine if there are more results, and request the next page of results
-     */
-    paged(): Promise<IPagedResult>;
 }
 export interface IDirectoryObjects extends _DirectoryObjects, IGetById<IDirectoryObjectType> {
 }

package/directory-objects/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/graph/directory-objects/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAyB,MAAM,sBAAsB,CAAC;AACjH,OAAO,EAAE,eAAe,IAAI,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC3F,OAAO,EAAwB,QAAQ,EAAc,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG3F,OAAO,EAAW,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;GAEG;AACH,qBACa,gBAAgB,CAAC,OAAO,GAAG,oBAAoB,CAAE,SAAQ,uBAAuB,CAAC,OAAO,CAAC;IAElG;;;;KAIC;IACM,gBAAgB,CAAC,mBAAmB,UAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvE;;;;KAIC;IACM,eAAe,CAAC,mBAAmB,UAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAItE;;;;KAIC;IACM,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAGlE;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB,EAAE,WAAW;CAAI;AAC3E,eAAO,MAAM,eAAe,yEAA4D,CAAC;AAEzF;;;GAGG;AACH,qBAEa,iBAAiB,CAAC,OAAO,GAAG,oBAAoB,EAAE,CAAE,SAAQ,yBAAyB,CAAC,OAAO,CAAC;IACvG;;;;;;IAMA;IACO,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,oBAA2D,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAIlI;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC;;;;OAIG;IACI,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAGxC;AACD,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB,EAAE,QAAQ,CAAC,oBAAoB,CAAC;CAAI;AAChG,eAAO,MAAM,gBAAgB,0EAA8D,CAAC;AAE5F;;GAEG;AACH,oBAAY,oBAAoB;IAC5B;;KAEC;IACD,eAAe,IAAA;IACf;;KAEC;IACD,IAAI,IAAA;IACJ;;KAEC;IACD,KAAK,IAAA;IACL;;KAEC;IACD,MAAM,IAAA;CACT"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/graph/directory-objects/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAoC,MAAM,sBAAsB,CAAC;AAC1G,OAAO,EAAE,eAAe,IAAI,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC3F,OAAO,EAAwB,QAAQ,EAAc,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI3F;;GAEG;AACH,qBACa,gBAAgB,CAAC,OAAO,GAAG,oBAAoB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAEzF;;;;KAIC;IACM,gBAAgB,CAAC,mBAAmB,UAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvE;;;;KAIC;IACM,eAAe,CAAC,mBAAmB,UAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAItE;;;;KAIC;IACM,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAGlE;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB,EAAE,WAAW;CAAI;AAC3E,eAAO,MAAM,eAAe,yEAA4D,CAAC;AAEzF;;;GAGG;AACH,qBAEa,iBAAiB,CAAC,OAAO,GAAG,oBAAoB,EAAE,CAAE,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IAC9F;;;;;;IAMA;IACO,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,oBAA2D,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAIlI;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;CAGxC;AACD,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB,EAAE,QAAQ,CAAC,oBAAoB,CAAC;CAAI;AAChG,eAAO,MAAM,gBAAgB,0EAA8D,CAAC;AAE5F;;GAEG;AACH,oBAAY,oBAAoB;IAC5B;;KAEC;IACD,eAAe,IAAA;IACf;;KAEC;IACD,IAAI,IAAA;IACJ;;KAEC;IACD,KAAK,IAAA;IACL;;KAEC;IACD,MAAM,IAAA;CACT"}

package/directory-objects/types.js

@@ -1,13 +1,12 @@
 import { __decorate } from "tslib";
-import { _GraphQueryableCollection, _GraphQueryableInstance, graphInvokableFactory } from "../graphqueryable.js";
+import { _GraphCollection, _GraphInstance, graphInvokableFactory, graphPost } from "../graphqueryable.js";
 import { defaultPath, getById, deleteable } from "../decorators.js";
 import { body } from "@pnp/queryable";
-import { graphPost } from "../operations.js";
-import { AsPaged } from "../behaviors/paged.js";
+import { Count } from "../behaviors/paged.js";
 /**
  * Represents a Directory Object entity
  */
-let _DirectoryObject = class _DirectoryObject extends _GraphQueryableInstance {
+let _DirectoryObject = class _DirectoryObject extends _GraphInstance {
     /**
    * Returns all the groups and directory roles that the specified Directory Object is a member of. The check is transitive
    *
@@ -42,7 +41,7 @@ export const DirectoryObject = graphInvokableFactory(_DirectoryObject);
  * Describes a collection of Directory Objects
  *
  */
-let _DirectoryObjects = class _DirectoryObjects extends _GraphQueryableCollection {
+let _DirectoryObjects = class _DirectoryObjects extends _GraphCollection {
     /**
   * Returns the directory objects specified in a list of ids. NOTE: The directory objects returned are the full objects containing all their properties.
   * The $select query option is not available for this operation.
@@ -58,17 +57,7 @@ let _DirectoryObjects = class _DirectoryObjects extends _GraphQueryableCollectio
      *  If the resource doesn't support count, this value will always be zero
      */
     async count() {
-        const q = AsPaged(this, true);
-        const r = await q.top(1)();
-        return r.count;
-    }
-    /**
-     * Allows reading through a collection as pages of information whose size is determined by top or the api method's default
-     *
-     * @returns an object containing results, the ability to determine if there are more results, and request the next page of results
-     */
-    paged() {
-        return AsPaged(this, true)();
+        return Count(this);
     }
 };
 _DirectoryObjects = __decorate([

package/directory-objects/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../packages/graph/directory-objects/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEjH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAY,UAAU,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAgB,MAAM,uBAAuB,CAAC;AAE9D;;GAEG;AAEH,IAAa,gBAAgB,GAA7B,MAAa,gBAAiD,SAAQ,uBAAgC;IAElG;;;;KAIC;IACM,gBAAgB,CAAC,mBAAmB,GAAG,KAAK;QAC/C,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,IAAI,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED;;;;KAIC;IACM,eAAe,CAAC,mBAAmB,GAAG,KAAK;QAC9C,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED;;;;KAIC;IACM,iBAAiB,CAAC,QAAkB;QACvC,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,mBAAmB,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;CACJ,CAAA;AA5BY,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CA4B5B;SA5BY,gBAAgB;AA+B7B,MAAM,CAAC,MAAM,eAAe,GAAG,qBAAqB,CAAmB,gBAAgB,CAAC,CAAC;AAEzF;;;GAGG;AAGH,IAAa,iBAAiB,GAA9B,MAAa,iBAAoD,SAAQ,yBAAkC;IACvG;;;;;;IAMA;IACO,QAAQ,CAAC,GAAa,EAAE,OAA6B,oBAAoB,CAAC,eAAe;QAC5F,OAAO,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,KAAK;QACd,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9B,MAAM,CAAC,GAAiB,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACI,KAAK;QACR,OAAO,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;IACjC,CAAC;CACJ,CAAA;AA9BY,iBAAiB;IAF7B,WAAW,CAAC,kBAAkB,CAAC;IAC/B,OAAO,CAAC,eAAe,CAAC;GACZ,iBAAiB,CA8B7B;SA9BY,iBAAiB;AAgC9B,MAAM,CAAC,MAAM,gBAAgB,GAAG,qBAAqB,CAAoB,iBAAiB,CAAC,CAAC;AAE5F;;GAEG;AACH,MAAM,CAAN,IAAY,oBAiBX;AAjBD,WAAY,oBAAoB;IAC5B;;KAEC;IACD,qFAAe,CAAA;IACf;;KAEC;IACD,+DAAI,CAAA;IACJ;;KAEC;IACD,iEAAK,CAAA;IACL;;KAEC;IACD,mEAAM,CAAA;AACV,CAAC,EAjBW,oBAAoB,KAApB,oBAAoB,QAiB/B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../packages/graph/directory-objects/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE1G,OAAO,EAAE,WAAW,EAAE,OAAO,EAAY,UAAU,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C;;GAEG;AAEH,IAAa,gBAAgB,GAA7B,MAAa,gBAAiD,SAAQ,cAAuB;IAEzF;;;;KAIC;IACM,gBAAgB,CAAC,mBAAmB,GAAG,KAAK;QAC/C,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,IAAI,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED;;;;KAIC;IACM,eAAe,CAAC,mBAAmB,GAAG,KAAK;QAC9C,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED;;;;KAIC;IACM,iBAAiB,CAAC,QAAkB;QACvC,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,mBAAmB,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;CACJ,CAAA;AA5BY,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CA4B5B;SA5BY,gBAAgB;AA+B7B,MAAM,CAAC,MAAM,eAAe,GAAG,qBAAqB,CAAmB,gBAAgB,CAAC,CAAC;AAEzF;;;GAGG;AAGH,IAAa,iBAAiB,GAA9B,MAAa,iBAAoD,SAAQ,gBAAyB;IAC9F;;;;;;IAMA;IACO,QAAQ,CAAC,GAAa,EAAE,OAA6B,oBAAoB,CAAC,eAAe;QAC5F,OAAO,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,KAAK;QACd,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;CACJ,CAAA;AAnBY,iBAAiB;IAF7B,WAAW,CAAC,kBAAkB,CAAC;IAC/B,OAAO,CAAC,eAAe,CAAC;GACZ,iBAAiB,CAmB7B;SAnBY,iBAAiB;AAqB9B,MAAM,CAAC,MAAM,gBAAgB,GAAG,qBAAqB,CAAoB,iBAAiB,CAAC,CAAC;AAE5F;;GAEG;AACH,MAAM,CAAN,IAAY,oBAiBX;AAjBD,WAAY,oBAAoB;IAC5B;;KAEC;IACD,qFAAe,CAAA;IACf;;KAEC;IACD,+DAAI,CAAA;IACJ;;KAEC;IACD,iEAAK,CAAA;IACL;;KAEC;IACD,mEAAM,CAAA;AACV,CAAC,EAjBW,oBAAoB,KAApB,oBAAoB,QAiB/B"}

package/{onedrive → files}/funcs.d.ts

@@ -5,5 +5,6 @@ export interface ICheckInOptions {
 }
 export declare function checkIn(checkInOptions?: ICheckInOptions): Promise<void>;
 export declare function checkOut(): Promise<void>;
+export declare function encodeSharingUrl(url: string): string;
 export declare function driveItemUpload(fileOptions: IFileOptions): Promise<IDriveItemAddResult>;
 //# sourceMappingURL=funcs.d.ts.map

package/files/funcs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"funcs.d.ts","sourceRoot":"","sources":["../../../../packages/graph/files/funcs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,mBAAmB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,OAAO,CAAC,cAAc,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvE;AAED,wBAAgB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAExC;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqB7F"}

package/{onedrive → files}/funcs.js

@@ -1,6 +1,6 @@
 import { combine } from "@pnp/core";
 import { body, InjectHeaders } from "@pnp/queryable";
-import { graphPost, graphPut } from "../operations.js";
+import { graphPost, graphPut } from "../graphqueryable.js";
 import { DriveItem } from "./types.js";
 export function checkIn(checkInOptions) {
     return graphPost(DriveItem(this, "checkin"), body(checkInOptions));
@@ -8,6 +8,9 @@ export function checkIn(checkInOptions) {
 export function checkOut() {
     return graphPost(DriveItem(this, "checkout"));
 }
+export function encodeSharingUrl(url) {
+    return "u!" + Buffer.from(url, "utf8").toString("base64").replace(/=$/i, "").replace("/", "_").replace("+", "-");
+}
 export async function driveItemUpload(fileOptions) {
     let path = "/content";
     if (fileOptions.filePathName) {

package/files/funcs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"funcs.js","sourceRoot":"","sources":["../../../../packages/graph/files/funcs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAqC,MAAM,YAAY,CAAC;AAO1E,MAAM,UAAU,OAAO,CAAC,cAAgC;IACpD,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,QAAQ;IACpB,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAW;IACxC,OAAO,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACrH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,WAAyB;IAC3D,IAAI,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,WAAW,CAAC,YAAY,EAAE;QAC1B,IAAI,GAAG,KAAK,WAAW,CAAC,YAAY,WAAW,CAAC;KACnD;IACD,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEhC,mIAAmI;IACnI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,IAAI,WAAW,CAAC,WAAW,EAAE;QACzB,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;YAClB,cAAc,EAAE,WAAW,CAAC,WAAW;SAC1C,CAAC,CAAC,CAAC;KACP;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;IAE9D,OAAO;QACH,IAAI;QACJ,SAAS,EAAE,SAAS,CAAC,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACvG,CAAC;AACN,CAAC"}

package/files/groups.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"groups.d.ts","sourceRoot":"","sources":["../../../../packages/graph/files/groups.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,eAAe,EAAY,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,MAAM,EAAS,OAAO,EAAsB,MAAM,YAAY,CAAC;AAExE,OAAO,QAAQ,iBAAiB,CAAC;IAC7B,UAAU,MAAM;QACZ,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;KAC5B;IACD,UAAU,MAAM;QACZ,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;KAC5B;CACJ;AAKD,OAAO,QAAQ,SAAS,CAAC;IACrB,UAAU,UAAU;QAChB,OAAO,CAAC,cAAc,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;KAC7B;IAED,UAAU,SAAS;QACf,OAAO,CAAC,cAAc,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;KAC7B;CACJ"}

package/files/groups.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"groups.js","sourceRoot":"","sources":["../../../../packages/graph/files/groups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAmB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAU,KAAK,EAAW,MAAM,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAaxE,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AAChC,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAclC,UAAU,CAAC,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;AACvC,UAAU,CAAC,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC"}

package/{onedrive → files}/index.d.ts

@@ -3,8 +3,8 @@ import "./groups.js";
 import "./sites.js";
 import { IDrives } from "./types.js";
 export { SpecialFolder, } from "./users.js";
-export { ICheckInOptions, } from "./funcs.js";
-export { Drive, DriveItem, DriveItems, Drives, IDrive, IDriveItem, IDriveItemAddResult, IDriveItemVersionInfo, IDriveItems, IDrives, IRoot, Root, ISharingWithMeOptions, IItemOptions as IItemReferenceOptions, IDeltaItems, IPreviewOptions, IFileOptions, IAnalyticsOptions, } from "./types.js";
+export { ICheckInOptions, encodeSharingUrl, } from "./funcs.js";
+export { Drive, DriveItem, DriveItems, Drives, IDrive, IDriveItem, IDriveItemAddResult, IDriveItemVersionInfo, IDriveItems, IDrives, IRoot, Root, ISharingWithMeOptions, IItemOptions as IItemReferenceOptions, IDeltaItems, IPreviewOptions, IFileOptions, } from "./types.js";
 declare module "../fi" {
     interface GraphFI {
         readonly drives: IDrives;

package/files/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../packages/graph/files/index.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,CAAC;AACpB,OAAO,aAAa,CAAC;AACrB,OAAO,YAAY,CAAC;AACpB,OAAO,EAAU,OAAO,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EACH,aAAa,GAChB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACH,eAAe,EACf,gBAAgB,GACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACH,KAAK,EACL,SAAS,EACT,UAAU,EACV,MAAM,EACN,MAAM,EACN,UAAU,EACV,mBAAmB,EACnB,qBAAqB,EACrB,WAAW,EACX,OAAO,EACP,KAAK,EACL,IAAI,EACJ,qBAAqB,EACrB,YAAY,IAAI,qBAAqB,EACrC,WAAW,EACX,eAAe,EACf,YAAY,GACf,MAAM,YAAY,CAAC;AAEpB,OAAO,QAAQ,OAAO,CAAC;IACnB,UAAU,OAAO;QACb,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;KAC5B;CACJ"}

package/{onedrive → files}/index.js

@@ -3,7 +3,7 @@ import "./users.js";
 import "./groups.js";
 import "./sites.js";
 import { Drives } from "./types.js";
-export { SpecialFolder, } from "./users.js";
+export { encodeSharingUrl, } from "./funcs.js";
 export { Drive, DriveItem, DriveItems, Drives, Root, } from "./types.js";
 Reflect.defineProperty(GraphFI.prototype, "drives", {
     configurable: true,

package/files/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/graph/files/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,YAAY,CAAC;AACpB,OAAO,aAAa,CAAC;AACrB,OAAO,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAM7C,OAAO,EAEH,gBAAgB,GACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACH,KAAK,EACL,SAAS,EACT,UAAU,EACV,MAAM,EAQN,IAAI,GAMP,MAAM,YAAY,CAAC;AAQpB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;IAChD,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,IAAI;IAChB,GAAG,EAAE;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;CACJ,CAAC,CAAC"}

package/files/sites.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sites.d.ts","sourceRoot":"","sources":["../../../../packages/graph/files/sites.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAS,OAAO,EAAsB,MAAM,YAAY,CAAC;AACxE,OAAO,EAAW,eAAe,EAAY,MAAM,YAAY,CAAC;AAGhE,OAAO,QAAQ,gBAAgB,CAAC;IAC5B,UAAU,KAAK;QACX,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;KAC5B;IACD,UAAU,KAAK;QACX,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;KAC5B;CACJ;AAMD,OAAO,QAAQ,SAAS,CAAC;IACrB,UAAU,UAAU;QAChB,OAAO,CAAC,cAAc,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;KAC7B;IAED,UAAU,SAAS;QACf,OAAO,CAAC,cAAc,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;KAC7B;CACJ"}

package/files/sites.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sites.js","sourceRoot":"","sources":["../../../../packages/graph/files/sites.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAU,KAAK,EAAW,MAAM,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,OAAO,EAAmB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAchE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AAC/B,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAejC,UAAU,CAAC,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;AACvC,UAAU,CAAC,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC"}

package/{onedrive → files}/types.d.ts

@@ -1,11 +1,11 @@
-import { _GraphQueryableInstance, IGraphQueryableInstance, IGraphQueryableCollection, _GraphQueryableCollection } from "../graphqueryable.js";
-import { Drive as IDriveType, DriveItem as IDriveItemType, ItemPreviewInfo as IDriveItemPreviewInfo, ItemAnalytics as IItemAnalytics } from "@microsoft/microsoft-graph-types";
+import { _GraphInstance, IGraphInstance, IGraphCollection, _GraphCollection } from "../graphqueryable.js";
+import { Drive as IDriveType, DriveItem as IDriveItemType, ItemPreviewInfo as IDriveItemPreviewInfo } from "@microsoft/microsoft-graph-types";
 import { IGetById, IDeleteable, IUpdateable } from "../decorators.js";
 /**
  * Describes a Drive instance
  *
  */
-export declare class _Drive extends _GraphQueryableInstance<IDriveType> {
+export declare class _Drive extends _GraphInstance<IDriveType> {
     /**
      * Method for retrieving the root folder of a drive.
      * @returns IRoot
@@ -13,9 +13,9 @@ export declare class _Drive extends _GraphQueryableInstance<IDriveType> {
     get root(): IRoot;
     /**
      * Method for retrieving the related list resource, for use with SharePoint drives.
-     * @returns IGraphQueryableInstance
+     * @returns IGraphInstance
      */
-    get list(): IGraphQueryableInstance;
+    get list(): IGraphInstance;
     /**
      * Method for retrieving recently accessed drive items by the user.
      * @returns IDriveItems
@@ -58,7 +58,7 @@ export declare const Drive: import("../graphqueryable.js").IGraphInvokableFactor
  * Describes a collection of Drive objects
  *
  */
-export declare class _Drives extends _GraphQueryableCollection<IDriveType[]> {
+export declare class _Drives extends _GraphCollection<IDriveType[]> {
 }
 export interface IDrives extends _Drives, IGetById<IDrive> {
 }
@@ -67,7 +67,7 @@ export declare const Drives: import("../graphqueryable.js").IGraphInvokableFacto
  * Describes a Root instance
  *
  */
-export declare class _Root extends _GraphQueryableInstance<IDriveItemType> {
+export declare class _Root extends _GraphInstance<IDriveItemType> {
     /**
      * Method for retrieving children of a folder drive item.
      * @returns IDriveItems
@@ -76,21 +76,21 @@ export declare class _Root extends _GraphQueryableInstance<IDriveItemType> {
     /**
      * Search drive for items matching the query
      * @param query string, search parameter
-     * @returns IGraphQueryableCollection
+     * @returns IGraphCollection
      */
-    search(query: string): IGraphQueryableCollection;
+    search(query: string): IGraphCollection;
     /**
      * Method for retrieving thumbnails of the drive items.
-     * @returns IGraphQueryableCollection
+     * @returns IGraphCollection
      */
-    get thumbnails(): IGraphQueryableCollection;
+    get thumbnails(): IGraphCollection;
     /**
      * Get changes since optional change token
      * @param token - string (Optional)
      * change token
      * @returns IDeltaItems
      */
-    delta(token?: string): IGraphQueryableCollection<IDeltaItems>;
+    delta(token?: string): IGraphCollection<IDeltaItems>;
     /**
      * Method for uploading a new file, or updating the contents of an existing file.
      * @param fileOptions - IFileOptions
@@ -110,22 +110,23 @@ export declare const Root: import("../graphqueryable.js").IGraphInvokableFactory
  * Describes a Drive Item instance
  *
  */
-export declare class _DriveItem extends _GraphQueryableInstance<IDriveItemType> {
+export declare class _DriveItem extends _GraphInstance<IDriveItemType> {
     /**
      * Method for retrieving children of a folder drive item.
      * @returns IDriveItems
      */
     get children(): IDriveItems;
+    get items(): IDriveItems;
     /**
      * Method for retrieving thumbnails of the drive items.
-     * @returns IGraphQueryableCollection
+     * @returns IGraphCollection
      */
-    get thumbnails(): IGraphQueryableCollection;
+    get thumbnails(): IGraphCollection;
     /**
      * Method for retrieving the versions of a drive item.
      * @returns IDriveItemVersionInfo
      */
-    get versions(): IGraphQueryableCollection<IDriveItemVersionInfo>;
+    get versions(): IGraphCollection<IDriveItemVersionInfo>;
     /**
      * Method for moving a drive item
      * @param parentReference - { id: string} - reference to destination folder drive item
@@ -186,12 +187,6 @@ export declare class _DriveItem extends _GraphQueryableInstance<IDriveItemType>
      * @returns IDriveItemPreviewInfo
      */
     preview(previewOptions?: IPreviewOptions): Promise<IDriveItemPreviewInfo>;
-    /**
-     * Method for getting item analytics. Defaults to lastSevenDays.
-     * @param analyticsOptions - IAnalyticsOptions (Optional)
-     * @returns IGraphQueryableCollection<IItemAnalytics>
-     */
-    analytics(analyticsOptions?: IAnalyticsOptions): IGraphQueryableCollection<IItemAnalytics>;
 }
 export interface IDriveItem extends _DriveItem, IDeleteable, IUpdateable {
 }
@@ -200,7 +195,7 @@ export declare const DriveItem: import("../graphqueryable.js").IGraphInvokableFa
  * Describes a collection of Drive Item objects
  *
  */
-export declare class _DriveItems extends _GraphQueryableCollection<IDriveItemType[]> {
+export declare class _DriveItems extends _GraphCollection<IDriveItemType[]> {
     /**
      * Adds a file to this collection of drive items.
      * For more upload options please see the .upload method on DriveItem and Root.
@@ -259,11 +254,8 @@ export interface IPreviewOptions {
     zoom?: number;
 }
 export interface IDeltaItems {
-    next: IGraphQueryableCollection<IDeltaItems>;
-    delta: IGraphQueryableCollection<IDeltaItems>;
+    next: IGraphCollection<IDeltaItems>;
+    delta: IGraphCollection<IDeltaItems>;
     values: any[];
 }
-export interface IAnalyticsOptions {
-    timeRange: "allTime" | "lastSevenDays";
-}
 //# sourceMappingURL=types.d.ts.map

package/files/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/graph/files/types.ts"],"names":[],"mappings":"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"}

package/{onedrive → files}/types.js

@@ -1,16 +1,14 @@
 import { __decorate } from "tslib";
-import { GraphQueryableInstance, GraphQueryableCollection, _GraphQueryableInstance, _GraphQueryableCollection, graphInvokableFactory, GraphQueryable, } from "../graphqueryable.js";
+import { GraphInstance, GraphCollection, _GraphInstance, _GraphCollection, graphInvokableFactory, GraphQueryable, graphPatch, graphPost, graphPut, } from "../graphqueryable.js";
 import { combine } from "@pnp/core";
 import { defaultPath, getById, deleteable, updateable } from "../decorators.js";
 import { body, BlobParse, CacheNever, errorCheck, InjectHeaders } from "@pnp/queryable";
-import { graphPatch, graphPost, graphPut } from "../operations.js";
 import { driveItemUpload } from "./funcs.js";
-import { AsPaged } from "../behaviors/paged.js";
 /**
  * Describes a Drive instance
  *
  */
-let _Drive = class _Drive extends _GraphQueryableInstance {
+let _Drive = class _Drive extends _GraphInstance {
     /**
      * Method for retrieving the root folder of a drive.
      * @returns IRoot
@@ -20,10 +18,10 @@ let _Drive = class _Drive extends _GraphQueryableInstance {
     }
     /**
      * Method for retrieving the related list resource, for use with SharePoint drives.
-     * @returns IGraphQueryableInstance
+     * @returns IGraphInstance
      */
     get list() {
-        return GraphQueryableInstance(this, "list");
+        return GraphInstance(this, "list");
     }
     /**
      * Method for retrieving recently accessed drive items by the user.
@@ -85,7 +83,7 @@ export const Drive = graphInvokableFactory(_Drive);
  * Describes a collection of Drive objects
  *
  */
-let _Drives = class _Drives extends _GraphQueryableCollection {
+let _Drives = class _Drives extends _GraphCollection {
 };
 _Drives = __decorate([
     defaultPath("drives"),
@@ -97,7 +95,7 @@ export const Drives = graphInvokableFactory(_Drives);
  * Describes a Root instance
  *
  */
-let _Root = class _Root extends _GraphQueryableInstance {
+let _Root = class _Root extends _GraphInstance {
     /**
      * Method for retrieving children of a folder drive item.
      * @returns IDriveItems
@@ -108,17 +106,17 @@ let _Root = class _Root extends _GraphQueryableInstance {
     /**
      * Search drive for items matching the query
      * @param query string, search parameter
-     * @returns IGraphQueryableCollection
+     * @returns IGraphCollection
      */
     search(query) {
-        return GraphQueryableCollection(this, `search(q='${query}')`);
+        return GraphCollection(this, `search(q='${query}')`);
     }
     /**
      * Method for retrieving thumbnails of the drive items.
-     * @returns IGraphQueryableCollection
+     * @returns IGraphCollection
      */
     get thumbnails() {
-        return GraphQueryableCollection(this, "thumbnails");
+        return GraphCollection(this, "thumbnails");
     }
     /**
      * Get changes since optional change token
@@ -128,15 +126,16 @@ let _Root = class _Root extends _GraphQueryableInstance {
      */
     delta(token) {
         const path = `delta${(token) ? `(token=${token})` : ""}`;
-        const query = GraphQueryableCollection(this, path);
+        const query = GraphCollection(this, path);
         query.on.parse.replace(errorCheck);
         query.on.parse(async (url, response, result) => {
             const json = await response.json();
             const nextLink = json["@odata.nextLink"];
             const deltaLink = json["@odata.deltaLink"];
             result = {
-                next: () => (nextLink ? AsPaged(GraphQueryableCollection([this, nextLink]))() : null),
-                delta: () => (deltaLink ? GraphQueryableCollection([query, deltaLink])() : null),
+                // TODO:: update docs to show how to load next with async iterator
+                next: () => (nextLink ? GraphCollection([this, nextLink]) : null),
+                delta: () => (deltaLink ? GraphCollection([query, deltaLink])() : null),
                 values: json.value,
             };
             return [url, response, result];
@@ -166,7 +165,7 @@ export const Root = graphInvokableFactory(_Root);
  * Describes a Drive Item instance
  *
  */
-let _DriveItem = class _DriveItem extends _GraphQueryableInstance {
+let _DriveItem = class _DriveItem extends _GraphInstance {
     /**
      * Method for retrieving children of a folder drive item.
      * @returns IDriveItems
@@ -174,19 +173,22 @@ let _DriveItem = class _DriveItem extends _GraphQueryableInstance {
     get children() {
         return DriveItems(this, "children");
     }
+    get items() {
+        return DriveItems(this, "items");
+    }
     /**
      * Method for retrieving thumbnails of the drive items.
-     * @returns IGraphQueryableCollection
+     * @returns IGraphCollection
      */
     get thumbnails() {
-        return GraphQueryableCollection(this, "thumbnails");
+        return GraphCollection(this, "thumbnails");
     }
     /**
      * Method for retrieving the versions of a drive item.
      * @returns IDriveItemVersionInfo
      */
     get versions() {
-        return GraphQueryableCollection(this, "versions");
+        return GraphCollection(this, "versions");
     }
     /**
      * Method for moving a drive item
@@ -290,15 +292,6 @@ let _DriveItem = class _DriveItem extends _GraphQueryableInstance {
     async preview(previewOptions) {
         return graphPost(DriveItem(this, "preview"), body(previewOptions));
     }
-    /**
-     * Method for getting item analytics. Defaults to lastSevenDays.
-     * @param analyticsOptions - IAnalyticsOptions (Optional)
-     * @returns IGraphQueryableCollection<IItemAnalytics>
-     */
-    analytics(analyticsOptions) {
-        const query = `analytics/${analyticsOptions ? analyticsOptions.timeRange : "lastSevenDays"}`;
-        return GraphQueryableCollection(this, query);
-    }
 };
 _DriveItem = __decorate([
     deleteable(),
@@ -310,7 +303,7 @@ export const DriveItem = graphInvokableFactory(_DriveItem);
  * Describes a collection of Drive Item objects
  *
  */
-let _DriveItems = class _DriveItems extends _GraphQueryableCollection {
+let _DriveItems = class _DriveItems extends _GraphCollection {
     /**
      * Adds a file to this collection of drive items.
      * For more upload options please see the .upload method on DriveItem and Root.

package/files/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../packages/graph/files/types.ts"],"names":[],"mappings":"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"}