Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert change to remove encoding of handles out of the DDS #20974

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/dds/cell/api-report/cell.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions';
import { Serializable } from '@fluidframework/datastore-definitions';
import { SharedObject } from '@fluidframework/shared-object-base';

// @public @sealed
// @internal @sealed
export class CellFactory implements IChannelFactory {
// (undocumented)
static readonly Attributes: IChannelAttributes;
Expand Down
4 changes: 3 additions & 1 deletion packages/dds/cell/src/cellFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { pkgVersion } from "./packageVersion.js";

/**
* {@link @fluidframework/datastore-definitions#IChannelFactory} for {@link ISharedCell}.
*
* @internal
* @sealed
*/
export class CellFactory implements IChannelFactory {
Expand Down Expand Up @@ -49,6 +49,7 @@ export class CellFactory implements IChannelFactory {

/**
* {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.load}
* @internal
*/
public async load(
runtime: IFluidDataStoreRuntime,
Expand All @@ -63,6 +64,7 @@ export class CellFactory implements IChannelFactory {

/**
* {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.create}
* @internal
*/
public create(document: IFluidDataStoreRuntime, id: string): ISharedCell {
const cell = new SharedCell(id, document, this.attributes);
Expand Down
24 changes: 11 additions & 13 deletions packages/dds/matrix/api-report/matrix.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,24 @@

import { IChannel } from '@fluidframework/datastore-definitions';
import { IChannelAttributes } from '@fluidframework/datastore-definitions';
import { IChannelAttributes as IChannelAttributes_2 } from '@fluidframework/datastore-definitions/internal';
import { IChannelFactory } from '@fluidframework/datastore-definitions';
import { IChannelServices } from '@fluidframework/datastore-definitions';
import { IChannelStorageService } from '@fluidframework/datastore-definitions/internal';
import { IEvent } from '@fluidframework/core-interfaces/internal';
import { IEventProvider } from '@fluidframework/core-interfaces/internal';
import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces/internal';
import { IChannelStorageService } from '@fluidframework/datastore-definitions';
import { IEvent } from '@fluidframework/core-interfaces';
import { IEventProvider } from '@fluidframework/core-interfaces';
import { IEventThisPlaceHolder } from '@fluidframework/core-interfaces';
markfields marked this conversation as resolved.
Show resolved Hide resolved
import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
import { IFluidDataStoreRuntime as IFluidDataStoreRuntime_2 } from '@fluidframework/datastore-definitions/internal';
import { IFluidSerializer } from '@fluidframework/shared-object-base/internal';
import { IJSONSegment } from '@fluidframework/merge-tree/internal';
import { IFluidSerializer } from '@fluidframework/shared-object-base';
import { IJSONSegment } from '@fluidframework/merge-tree';
import { IMatrixConsumer } from '@tiny-calc/nano';
import { IMatrixProducer } from '@tiny-calc/nano';
import { IMatrixReader } from '@tiny-calc/nano';
import { IMatrixWriter } from '@tiny-calc/nano';
import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions';
import { ISharedObjectEvents } from '@fluidframework/shared-object-base/internal';
import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions/internal';
import { ISharedObjectEvents } from '@fluidframework/shared-object-base';
import { ISummaryTreeWithStats } from '@fluidframework/runtime-definitions';
import { Serializable } from '@fluidframework/datastore-definitions';
import { SharedObject } from '@fluidframework/shared-object-base/internal';
import { SharedObject } from '@fluidframework/shared-object-base';

// @alpha (undocumented)
export interface IRevertible {
Expand Down Expand Up @@ -65,13 +63,13 @@ export type MatrixItem<T> = Serializable<Exclude<T, null>> | undefined;

// @alpha
export class SharedMatrix<T = any> extends SharedObject<ISharedMatrixEvents<T> & ISharedObjectEvents> implements ISharedMatrix<T> {
constructor(runtime: IFluidDataStoreRuntime_2, id: string, attributes: IChannelAttributes_2, _isSetCellConflictResolutionPolicyFWW?: boolean);
constructor(runtime: IFluidDataStoreRuntime, id: string, attributes: IChannelAttributes, _isSetCellConflictResolutionPolicyFWW?: boolean);
protected applyStashedOp(content: unknown): void;
// (undocumented)
closeMatrix(consumer: IMatrixConsumer<MatrixItem<T>>): void;
// (undocumented)
get colCount(): number;
static create<T>(runtime: IFluidDataStoreRuntime_2, id?: string): SharedMatrix<T>;
static create<T>(runtime: IFluidDataStoreRuntime, id?: string): SharedMatrix<T>;
// (undocumented)
protected didAttach(): void;
// (undocumented)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,15 @@ export class ConsensusQueue<T = any> extends ConsensusOrderedCollection<T> {
static getFactory(): IChannelFactory;
}

// @public
// @internal
export class ConsensusQueueFactory implements IConsensusOrderedCollectionFactory {
// (undocumented)
static readonly Attributes: IChannelAttributes;
// (undocumented)
get attributes(): IChannelAttributes;
// (undocumented)
// @alpha (undocumented)
create(document: IFluidDataStoreRuntime, id: string): IConsensusOrderedCollection;
// @alpha
load(runtime: IFluidDataStoreRuntime, id: string, services: IChannelServices, attributes: IChannelAttributes): Promise<IConsensusOrderedCollection>;
// (undocumented)
static Type: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { pkgVersion } from "./packageVersion.js";

/**
* The factory that defines the consensus queue
* @internal
markfields marked this conversation as resolved.
Show resolved Hide resolved
*/
export class ConsensusQueueFactory implements IConsensusOrderedCollectionFactory {
public static Type = "https://graph.microsoft.com/types/consensus-queue";
Expand All @@ -34,6 +35,7 @@ export class ConsensusQueueFactory implements IConsensusOrderedCollectionFactory

/**
* {@inheritDoc @fluidframework/datastore-definitions#IChannelFactory.load}
* @alpha
*/
public async load(
runtime: IFluidDataStoreRuntime,
Expand All @@ -46,6 +48,9 @@ export class ConsensusQueueFactory implements IConsensusOrderedCollectionFactory
return collection;
}

/**
* @alpha
*/
public create(document: IFluidDataStoreRuntime, id: string): IConsensusOrderedCollection {
const collection = new ConsensusQueue(id, document, this.attributes);
collection.initializeLocal();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { ConsensusRegisterCollectionFactory } from "./consensusRegisterCollectio
import {
IConsensusRegisterCollection,
ReadPolicy,
type IConsensusRegisterCollectionEvents,
} from "./interfaces.js";

interface ILocalData<T> {
Expand Down
1 change: 0 additions & 1 deletion packages/dds/shared-object-base/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ export {
makeHandlesSerializable,
parseHandles,
serializeHandles,
bindHandles,
} from "./utils.js";
export { ValueType } from "./valueType.js";
1 change: 0 additions & 1 deletion packages/dds/shared-object-base/src/sharedObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import { FluidSerializer, IFluidSerializer } from "./serializer.js";
import { SharedObjectHandle } from "./handle.js";
import { SummarySerializer } from "./summarySerializer.js";
import { ISharedObject, ISharedObjectEvents } from "./types.js";
import { makeHandlesSerializable, parseHandles } from "./utils.js";

/**
* Base class from which all shared objects derive.
Expand Down
Loading