Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@tylerbutler
tylerbutler committed Nov 3, 2023
1 parent aadfdc5 commit b1f5e19
Show file tree
Hide file tree
Showing 11 changed files with 154 additions and 60 deletions.
11 changes: 11 additions & 0 deletions azure/packages/azure-client/.eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ module.exports = {
],
},
],

"import/no-unresolved": "off",
"import/default": "off",
"import/namespace": "off",
"import/no-deprecated": "off",
"import/no-empty-named-blocks": "off",
"import/no-extraneous-dependencies": "off",
"import/no-mutable-exports": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",
"import/no-unused-modules": "off",
},
overrides: [
{
Expand Down
11 changes: 11 additions & 0 deletions azure/packages/azure-service-utils/.eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ module.exports = {
},
},
],

"import/no-unresolved": "off",
"import/default": "off",
"import/namespace": "off",
"import/no-deprecated": "off",
"import/no-empty-named-blocks": "off",
"import/no-extraneous-dependencies": "off",
"import/no-mutable-exports": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",
"import/no-unused-modules": "off",
},
overrides: [
{
Expand Down
2 changes: 1 addition & 1 deletion common/build/build-common/tsconfig.test.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["./tsconfig.esm.json"],
"extends": ["./tsconfig.base.json", "./tsconfig.esm.json"],
"compilerOptions": {
"composite": false,
"types": ["node"],
Expand Down
125 changes: 69 additions & 56 deletions experimental/dds/tree2/api-report/tree2.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,30 @@
```ts

import { FactoryObjectNodeSchema as FactoryObjectNodeSchema_2 } from './schemaBuilder';
import { FactoryObjectNodeSchemaRecursive as FactoryObjectNodeSchemaRecursive_2 } from './schemaBuilder';
import { Forbidden as Forbidden_2 } from '../default-field-kinds';
import { IChannel } from '@fluidframework/datastore-definitions';
import { IChannelAttributes } from '@fluidframework/datastore-definitions';
import { IChannelFactory } from '@fluidframework/datastore-definitions';
import { IChannelServices } from '@fluidframework/datastore-definitions';
import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
import { IFluidHandle } from '@fluidframework/core-interfaces';
import { ISharedObject } from '@fluidframework/shared-object-base';
import { NodeKeyFieldKind as NodeKeyFieldKind_2 } from '../../feature-libraries';
import { Optional as Optional_2 } from '../../feature-libraries';
import { Optional as Optional_3 } from '../feature-libraries';
import { SchemaLibrary as SchemaLibrary_2 } from '../../feature-libraries';
import { SchemaLibrary as SchemaLibrary_3 } from '../feature-libraries';
import { SequenceFieldKind } from '../../feature-libraries';
import { SequenceFieldKind as SequenceFieldKind_2 } from '../feature-libraries';
import { SessionSpaceCompressedId } from '@fluidframework/runtime-definitions';
import { StableId } from '@fluidframework/runtime-definitions';
import type { Static } from '@sinclair/typebox';
import { TreeNodeSchema as TreeNodeSchema_2 } from '../../feature-libraries';
import { TreeNodeSchema as TreeNodeSchema_3 } from '../feature-libraries';
import type { TSchema } from '@sinclair/typebox';
import { ValueSchema as ValueSchema_2 } from '..';

// @alpha
export interface Adapters {
Expand Down Expand Up @@ -1179,25 +1192,25 @@ export interface JsonableTree extends GenericTreeNode<JsonableTree> {
export function jsonableTreeFromCursor(cursor: ITreeCursor): JsonableTree;

// @alpha (undocumented)
export const jsonArray: TreeNodeSchema<"com.fluidframework.json.array", {
export const jsonArray: TreeNodeSchema_2<"com.fluidframework.json.array", {
objectNodeFields: {
"": TreeFieldSchema<Sequence_2, readonly [() => TreeNodeSchema<"com.fluidframework.json.object", {
mapFields: TreeFieldSchema<Optional, readonly [any, () => TreeNodeSchema<"com.fluidframework.json.array", any>, TreeNodeSchema<"com.fluidframework.leaf.number", {
"": TreeFieldSchema<SequenceFieldKind, readonly [() => TreeNodeSchema_2<"com.fluidframework.json.object", {
mapFields: TreeFieldSchema<Optional_2, readonly [any, () => TreeNodeSchema_2<"com.fluidframework.json.array", any>, TreeNodeSchema_2<"com.fluidframework.leaf.number", {
leafValue: ValueSchema.Number;
}>, TreeNodeSchema<"com.fluidframework.leaf.boolean", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.boolean", {
leafValue: ValueSchema.Boolean;
}>, TreeNodeSchema<"com.fluidframework.leaf.string", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.string", {
leafValue: ValueSchema.String;
}>, TreeNodeSchema<"com.fluidframework.leaf.null", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.null", {
leafValue: ValueSchema.Null;
}>]>;
}>, () => TreeNodeSchema<"com.fluidframework.json.array", any>, TreeNodeSchema<"com.fluidframework.leaf.number", {
}>, () => TreeNodeSchema_2<"com.fluidframework.json.array", any>, TreeNodeSchema_2<"com.fluidframework.leaf.number", {
leafValue: ValueSchema.Number;
}>, TreeNodeSchema<"com.fluidframework.leaf.boolean", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.boolean", {
leafValue: ValueSchema.Boolean;
}>, TreeNodeSchema<"com.fluidframework.leaf.string", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.string", {
leafValue: ValueSchema.String;
}>, TreeNodeSchema<"com.fluidframework.leaf.null", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.null", {
leafValue: ValueSchema.Null;
}>]>;
};
Expand All @@ -1217,32 +1230,32 @@ export type JsonCompatibleReadOnly = string | number | boolean | null | readonly
};

// @alpha (undocumented)
export const jsonObject: TreeNodeSchema<"com.fluidframework.json.object", {
mapFields: TreeFieldSchema<Optional, readonly [() => TreeNodeSchema<"com.fluidframework.json.object", any>, () => TreeNodeSchema<"com.fluidframework.json.array", {
export const jsonObject: TreeNodeSchema_2<"com.fluidframework.json.object", {
mapFields: TreeFieldSchema<Optional_2, readonly [() => TreeNodeSchema_2<"com.fluidframework.json.object", any>, () => TreeNodeSchema_2<"com.fluidframework.json.array", {
objectNodeFields: {
"": TreeFieldSchema<Sequence_2, readonly [() => TreeNodeSchema<"com.fluidframework.json.object", any>, any, TreeNodeSchema<"com.fluidframework.leaf.number", {
"": TreeFieldSchema<SequenceFieldKind, readonly [() => TreeNodeSchema_2<"com.fluidframework.json.object", any>, any, TreeNodeSchema_2<"com.fluidframework.leaf.number", {
leafValue: ValueSchema.Number;
}>, TreeNodeSchema<"com.fluidframework.leaf.boolean", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.boolean", {
leafValue: ValueSchema.Boolean;
}>, TreeNodeSchema<"com.fluidframework.leaf.string", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.string", {
leafValue: ValueSchema.String;
}>, TreeNodeSchema<"com.fluidframework.leaf.null", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.null", {
leafValue: ValueSchema.Null;
}>]>;
};
}>, TreeNodeSchema<"com.fluidframework.leaf.number", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.number", {
leafValue: ValueSchema.Number;
}>, TreeNodeSchema<"com.fluidframework.leaf.boolean", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.boolean", {
leafValue: ValueSchema.Boolean;
}>, TreeNodeSchema<"com.fluidframework.leaf.string", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.string", {
leafValue: ValueSchema.String;
}>, TreeNodeSchema<"com.fluidframework.leaf.null", {
}>, TreeNodeSchema_2<"com.fluidframework.leaf.null", {
leafValue: ValueSchema.Null;
}>]>;
}>;

// @alpha (undocumented)
export const jsonSchema: SchemaLibrary;
export const jsonSchema: SchemaLibrary_2;

// @alpha
export interface JsonValidator {
Expand All @@ -1262,40 +1275,40 @@ export interface Leaf<in out TSchema extends LeafSchema> extends TreeNode {

// @alpha
export const leaf: {
number: TreeNodeSchema<"com.fluidframework.leaf.number", {
number: TreeNodeSchema_3<"com.fluidframework.leaf.number", {
leafValue: ValueSchema.Number;
}>;
boolean: TreeNodeSchema<"com.fluidframework.leaf.boolean", {
boolean: TreeNodeSchema_3<"com.fluidframework.leaf.boolean", {
leafValue: ValueSchema.Boolean;
}>;
string: TreeNodeSchema<"com.fluidframework.leaf.string", {
string: TreeNodeSchema_3<"com.fluidframework.leaf.string", {
leafValue: ValueSchema.String;
}>;
handle: TreeNodeSchema<"com.fluidframework.leaf.handle", {
handle: TreeNodeSchema_3<"com.fluidframework.leaf.handle", {
leafValue: ValueSchema.FluidHandle;
}>;
null: TreeNodeSchema<"com.fluidframework.leaf.null", {
null: TreeNodeSchema_3<"com.fluidframework.leaf.null", {
leafValue: ValueSchema.Null;
}>;
primitives: readonly [TreeNodeSchema<"com.fluidframework.leaf.number", {
primitives: readonly [TreeNodeSchema_3<"com.fluidframework.leaf.number", {
leafValue: ValueSchema.Number;
}>, TreeNodeSchema<"com.fluidframework.leaf.boolean", {
}>, TreeNodeSchema_3<"com.fluidframework.leaf.boolean", {
leafValue: ValueSchema.Boolean;
}>, TreeNodeSchema<"com.fluidframework.leaf.string", {
}>, TreeNodeSchema_3<"com.fluidframework.leaf.string", {
leafValue: ValueSchema.String;
}>];
all: readonly [TreeNodeSchema<"com.fluidframework.leaf.handle", {
all: readonly [TreeNodeSchema_3<"com.fluidframework.leaf.handle", {
leafValue: ValueSchema.FluidHandle;
}>, TreeNodeSchema<"com.fluidframework.leaf.null", {
}>, TreeNodeSchema_3<"com.fluidframework.leaf.null", {
leafValue: ValueSchema.Null;
}>, TreeNodeSchema<"com.fluidframework.leaf.number", {
}>, TreeNodeSchema_3<"com.fluidframework.leaf.number", {
leafValue: ValueSchema.Number;
}>, TreeNodeSchema<"com.fluidframework.leaf.boolean", {
}>, TreeNodeSchema_3<"com.fluidframework.leaf.boolean", {
leafValue: ValueSchema.Boolean;
}>, TreeNodeSchema<"com.fluidframework.leaf.string", {
}>, TreeNodeSchema_3<"com.fluidframework.leaf.string", {
leafValue: ValueSchema.String;
}>];
library: SchemaLibrary;
library: SchemaLibrary_3;
};

// @alpha (undocumented)
Expand All @@ -1308,7 +1321,7 @@ interface LeafSchemaSpecification {
}

// @alpha (undocumented)
const library: SchemaLibrary;
const library: SchemaLibrary_3;

// @alpha
export interface LocalNodeKey extends Opaque<Brand<SessionSpaceCompressedId, "Local Node Key">> {
Expand Down Expand Up @@ -1449,7 +1462,7 @@ interface NodeKeyField extends TreeField {

// @alpha
export const nodeKeyField: {
__n_id__: TreeFieldSchema<NodeKeyFieldKind, readonly [TreeNodeSchema<"com.fluidframework.nodeKey.NodeKey", {
__n_id__: TreeFieldSchema<NodeKeyFieldKind_2, readonly [TreeNodeSchema_2<"com.fluidframework.nodeKey.NodeKey", {
leafValue: ValueSchema.String;
}>]>;
};
Expand All @@ -1470,7 +1483,7 @@ interface NodeKeys {
}

// @alpha
export const nodeKeySchema: SchemaLibrary;
export const nodeKeySchema: SchemaLibrary_2;

// @alpha
export type NoListenersCallback<E extends Events<E>> = (eventName: keyof Events<E>) => void;
Expand Down Expand Up @@ -1691,18 +1704,18 @@ export interface RangeUpPath<TUpPath extends UpPath = UpPath> extends FieldUpPat
export function recordDependency(dependent: ObservingDependent | undefined, dependee: Dependee): void;

// @alpha (undocumented)
const recursiveObject: FactoryObjectNodeSchemaRecursive<"Test Recursive Domain", "object", {
readonly recursive: TreeFieldSchema<Optional, readonly [() => FactoryObjectNodeSchemaRecursive<"Test Recursive Domain", "object", any>]>;
readonly number: TreeNodeSchema<"com.fluidframework.leaf.number", {
leafValue: import("..").ValueSchema.Number;
const recursiveObject: FactoryObjectNodeSchemaRecursive_2<"Test Recursive Domain", "object", {
readonly recursive: TreeFieldSchema<Optional_3, readonly [() => FactoryObjectNodeSchemaRecursive_2<"Test Recursive Domain", "object", any>]>;
readonly number: TreeNodeSchema_3<"com.fluidframework.leaf.number", {
leafValue: ValueSchema_2.Number;
}>;
}>;

// @alpha (undocumented)
const recursiveObject2: FactoryObjectNodeSchema<"Test Recursive Domain", "object2", {
readonly recursive: TreeFieldSchema<Optional, readonly [() => FactoryObjectNodeSchema<"Test Recursive Domain", "object2", any>]>;
readonly number: TreeNodeSchema<"com.fluidframework.leaf.number", {
leafValue: import("..").ValueSchema.Number;
const recursiveObject2: FactoryObjectNodeSchema_2<"Test Recursive Domain", "object2", {
readonly recursive: TreeFieldSchema<Optional_3, readonly [() => FactoryObjectNodeSchema_2<"Test Recursive Domain", "object2", any>]>;
readonly number: TreeNodeSchema_3<"com.fluidframework.leaf.number", {
leafValue: ValueSchema_2.Number;
}>;
}>;

Expand Down Expand Up @@ -1795,12 +1808,12 @@ export class SchemaBuilder<TScope extends string = string, TName extends string
constructor(options: SchemaBuilderOptions<TScope>);
// (undocumented)
readonly boolean: TreeNodeSchema<"com.fluidframework.leaf.boolean", {
leafValue: import("..").ValueSchema.Boolean;
leafValue: ValueSchema_2.Boolean;
}>;
fixRecursiveReference<T extends AllowedTypes>(...types: T): void;
// (undocumented)
readonly handle: TreeNodeSchema<"com.fluidframework.leaf.handle", {
leafValue: import("..").ValueSchema.FluidHandle;
leafValue: ValueSchema_2.FluidHandle;
}>;
list<const T extends TreeNodeSchema | Any | readonly TreeNodeSchema[]>(allowedTypes: T): TreeNodeSchema<`${TScope}.List<${string}>`, {
objectNodeFields: {
Expand All @@ -1820,25 +1833,25 @@ export class SchemaBuilder<TScope extends string = string, TName extends string
}>;
// (undocumented)
readonly null: TreeNodeSchema<"com.fluidframework.leaf.null", {
leafValue: import("..").ValueSchema.Null;
leafValue: ValueSchema_2.Null;
}>;
// (undocumented)
readonly number: TreeNodeSchema<"com.fluidframework.leaf.number", {
leafValue: import("..").ValueSchema.Number;
leafValue: ValueSchema_2.Number;
}>;
// (undocumented)
object<const Name extends TName, const T extends RestrictiveReadonlyRecord<string, ImplicitFieldSchema>>(name: Name, t: T): FactoryObjectNodeSchema<TScope, Name, T>;
// (undocumented)
objectRecursive<const Name extends TName, const T extends Unenforced<RestrictiveReadonlyRecord<string, ImplicitFieldSchema>>>(name: Name, t: T): FactoryObjectNodeSchemaRecursive<TScope, Name, T>;
static optional: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Optional, NormalizeAllowedTypes<T>>;
readonly optional: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Optional, NormalizeAllowedTypes<T>>;
static optional: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Optional_3, NormalizeAllowedTypes<T>>;
readonly optional: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Optional_3, NormalizeAllowedTypes<T>>;
static required: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Required_2, NormalizeAllowedTypes<T>>;
readonly required: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Required_2, NormalizeAllowedTypes<T>>;
static sequence: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Sequence_2, NormalizeAllowedTypes<T>>;
readonly sequence: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<Sequence_2, NormalizeAllowedTypes<T>>;
static sequence: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<SequenceFieldKind_2, NormalizeAllowedTypes<T>>;
readonly sequence: <const T extends ImplicitAllowedTypes>(allowedTypes: T) => TreeFieldSchema<SequenceFieldKind_2, NormalizeAllowedTypes<T>>;
// (undocumented)
readonly string: TreeNodeSchema<"com.fluidframework.leaf.string", {
leafValue: import("..").ValueSchema.String;
leafValue: ValueSchema_2.String;
}>;
}

Expand Down Expand Up @@ -2162,7 +2175,7 @@ export class TreeFieldSchema<out TKind extends FieldKind = FieldKind, const out
get allowedTypeSet(): AllowedTypeSet;
static create<TKind extends FieldKind, const Types extends AllowedTypes>(kind: TKind, allowedTypes: Types): TreeFieldSchema<TKind, Types>;
static createUnsafe<TKind extends FieldKind, const Types>(kind: TKind, allowedTypes: Types): TreeFieldSchema<TKind, Types>;
static readonly empty: TreeFieldSchema<Forbidden, readonly []>;
static readonly empty: TreeFieldSchema<Forbidden_2, readonly []>;
equals(other: TreeFieldSchema): boolean;
// (undocumented)
readonly kind: TKind;
Expand Down
13 changes: 13 additions & 0 deletions packages/common/client-utils/.eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,17 @@ module.exports = {
"./src/test/types/tsconfig.json",
],
},
rules: {
"import/no-unresolved": "off",
"import/default": "off",
"import/export": "off",
"import/namespace": "off",
"import/no-deprecated": "off",
"import/no-empty-named-blocks": "off",
"import/no-extraneous-dependencies": "off",
"import/no-mutable-exports": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",
"import/no-unused-modules": "off",
}
};
14 changes: 13 additions & 1 deletion packages/common/driver-definitions/.eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,17 @@
*/

module.exports = {
extends: [require.resolve("@fluidframework/eslint-config-fluid"), "prettier"],
extends: ["@fluidframework/eslint-config-fluid/minimal", "prettier"],
rules: {
"import/no-unresolved": "off",
"import/default": "off",
"import/namespace": "off",
"import/no-deprecated": "off",
"import/no-empty-named-blocks": "off",
"import/no-extraneous-dependencies": "off",
"import/no-mutable-exports": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",
"import/no-unused-modules": "off",
},
};
11 changes: 11 additions & 0 deletions packages/runtime/container-runtime/.eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ module.exports = {

// This library is used in the browser, so we don't want dependencies on most node libraries.
"import/no-nodejs-modules": ["error", { allow: ["events"] }],

"import/no-unresolved": "off",
"import/default": "off",
"import/namespace": "off",
"import/no-deprecated": "off",
"import/no-empty-named-blocks": "off",
"import/no-extraneous-dependencies": "off",
"import/no-mutable-exports": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",
"import/no-unused-modules": "off",
},
overrides: [
{
Expand Down
12 changes: 12 additions & 0 deletions packages/test/mocha-test-setup/.eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,16 @@

module.exports = {
extends: ["@fluidframework/eslint-config-fluid/minimal", "prettier"],
rules: {
"import/no-unresolved": "off",
"import/default": "off",
"import/namespace": "off",
"import/no-deprecated": "off",
"import/no-empty-named-blocks": "off",
"import/no-extraneous-dependencies": "off",
"import/no-mutable-exports": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off",
"import/no-unused-modules": "off",
},
};
1 change: 0 additions & 1 deletion packages/test/mocha-test-setup/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"../../../common/build/build-common/tsconfig.cjs.json",
],
"include": ["src/**/*"],
"exclude": ["src/test/**/*"],
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist",
Expand Down
Loading

0 comments on commit b1f5e19

Please sign in to comment.