@yume-chan/struct 0.0.15 → 0.0.16

package/src/sync-promise.ts

@@ -0,0 +1,114 @@
+export interface SyncPromise<T> {
+    then<TResult1 = T, TResult2 = never>(
+        onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null | undefined,
+        onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined
+    ): SyncPromise<TResult1 | TResult2>;
+
+    valueOrPromise(): T | PromiseLike<T>;
+}
+
+interface SyncPromiseStatic {
+    reject<T = never>(reason?: any): SyncPromise<T>;
+
+    resolve(): SyncPromise<void>;
+    resolve<T>(value: T | PromiseLike<T>): SyncPromise<T>;
+
+    try<T>(executor: () => T | PromiseLike<T>): SyncPromise<T>;
+}
+
+export const SyncPromise: SyncPromiseStatic = {
+    reject<T = never>(reason?: any): SyncPromise<T> {
+        return new RejectedSyncPromise(reason);
+    },
+    resolve<T>(value?: T | PromiseLike<T>): SyncPromise<T> {
+        if (
+            typeof value === 'object' &&
+            value !== null &&
+            typeof (value as PromiseLike<T>).then === 'function'
+        ) {
+            if (
+                value instanceof PendingSyncPromise ||
+                value instanceof ResolvedSyncPromise ||
+                value instanceof RejectedSyncPromise
+            ) {
+                return value;
+            }
+
+            return new PendingSyncPromise(value as PromiseLike<T>);
+        } else {
+            return new ResolvedSyncPromise(value as T);
+        }
+    },
+    try<T>(executor: () => T | PromiseLike<T>): SyncPromise<T> {
+        try {
+            return SyncPromise.resolve(executor());
+        } catch (e) {
+            return SyncPromise.reject(e);
+        }
+    }
+};
+
+class PendingSyncPromise<T> implements SyncPromise<T> {
+    private promise: PromiseLike<T>;
+
+    public constructor(promise: PromiseLike<T>) {
+        this.promise = promise;
+    }
+
+    public then<TResult1 = T, TResult2 = never>(
+        onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null | undefined,
+        onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined
+    ) {
+        return new PendingSyncPromise<TResult1 | TResult2>(
+            this.promise.then(onfulfilled, onrejected)
+        );
+    }
+
+    public valueOrPromise(): T | PromiseLike<T> {
+        return this.promise;
+    }
+}
+
+class ResolvedSyncPromise<T> implements SyncPromise<T> {
+    private value: T;
+
+    public constructor(value: T) {
+        this.value = value;
+    }
+
+    public then<TResult1 = T, TResult2 = never>(
+        onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null | undefined,
+        onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined
+    ) {
+        if (!onfulfilled) {
+            return this as any;
+        }
+        return SyncPromise.try(() => onfulfilled(this.value));
+    }
+
+    public valueOrPromise(): T | PromiseLike<T> {
+        return this.value;
+    }
+}
+
+class RejectedSyncPromise<T> implements SyncPromise<T> {
+    private reason: any;
+
+    public constructor(reason: any) {
+        this.reason = reason;
+    }
+
+    public then<TResult1 = T, TResult2 = never>(
+        onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null | undefined,
+        onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined
+    ) {
+        if (!onrejected) {
+            return this as any;
+        }
+        return SyncPromise.try(() => onrejected(this.reason));
+    }
+
+    public valueOrPromise(): T | PromiseLike<T> {
+        throw this.reason;
+    }
+}

package/src/types/bigint.ts

@@ -1,102 +1,103 @@
-// cspell: ignore syncbird
-
-import { getBigInt64, getBigUint64, setBigInt64, setBigUint64 } from '@yume-chan/dataview-bigint-polyfill/esm/fallback.js';
-import { StructFieldDefinition, StructFieldValue, StructValue, type StructAsyncDeserializeStream, type StructDeserializeStream, type StructOptions } from "../basic/index.js";
-import { Syncbird } from "../syncbird.js";
-import type { ValueOrPromise } from "../utils.js";
-
-type DataViewBigInt64Getter = (dataView: DataView, byteOffset: number, littleEndian: boolean | undefined) => bigint;
-
-type DataViewBigInt64Setter = (dataView: DataView, byteOffset: number, value: bigint, littleEndian: boolean | undefined) => void;
-
-export class BigIntFieldType {
-    public readonly TTypeScriptType!: bigint;
-
-    public readonly size: number;
-
-    public readonly getter: DataViewBigInt64Getter;
-
-    public readonly setter: DataViewBigInt64Setter;
-
-    public constructor(
-        size: number,
-        getter: DataViewBigInt64Getter,
-        setter: DataViewBigInt64Setter,
-    ) {
-        this.size = size;
-        this.getter = getter;
-        this.setter = setter;
-    }
-
-    public static readonly Int64 = new BigIntFieldType(8, getBigInt64, setBigInt64);
-
-    public static readonly Uint64 = new BigIntFieldType(8, getBigUint64, setBigUint64);
-}
-
-export class BigIntFieldDefinition<
-    TType extends BigIntFieldType = BigIntFieldType,
-    TTypeScriptType = TType["TTypeScriptType"],
-    > extends StructFieldDefinition<
-    void,
-    TTypeScriptType
-    > {
-    public readonly type: TType;
-
-    public constructor(type: TType, _typescriptType?: TTypeScriptType) {
-        super();
-        this.type = type;
-    }
-
-    public getSize(): number {
-        return this.type.size;
-    }
-
-    public create(
-        options: Readonly<StructOptions>,
-        struct: StructValue,
-        value: TTypeScriptType,
-    ): BigIntFieldValue<this> {
-        return new BigIntFieldValue(this, options, struct, value);
-    }
-
-    public override deserialize(
-        options: Readonly<StructOptions>,
-        stream: StructDeserializeStream,
-        struct: StructValue,
-    ): BigIntFieldValue<this>;
-    public override deserialize(
-        options: Readonly<StructOptions>,
-        stream: StructAsyncDeserializeStream,
-        struct: StructValue,
-    ): Promise<BigIntFieldValue<this>>;
-    public override deserialize(
-        options: Readonly<StructOptions>,
-        stream: StructDeserializeStream | StructAsyncDeserializeStream,
-        struct: StructValue,
-    ): ValueOrPromise<BigIntFieldValue<this>> {
-        return Syncbird.try(() => {
-            return stream.read(this.getSize());
-        }).then(array => {
-            const view = new DataView(array.buffer, array.byteOffset, array.byteLength);
-            const value = this.type.getter(
-                view,
-                0,
-                options.littleEndian
-            );
-            return this.create(options, struct, value as any);
-        }).valueOrPromise();
-    }
-}
-
-export class BigIntFieldValue<
-    TDefinition extends BigIntFieldDefinition<BigIntFieldType, any>,
-    > extends StructFieldValue<TDefinition> {
-    public serialize(dataView: DataView, offset: number): void {
-        this.definition.type.setter(
-            dataView,
-            offset,
-            this.value!,
-            this.options.littleEndian
-        );
-    }
-}
+import { getBigInt64, getBigUint64, setBigInt64, setBigUint64 } from '@yume-chan/dataview-bigint-polyfill/esm/fallback.js';
+import { StructFieldDefinition, StructFieldValue, StructValue, type StructAsyncDeserializeStream, type StructDeserializeStream, type StructOptions } from "../basic/index.js";
+import { SyncPromise } from "../sync-promise.js";
+import type { ValueOrPromise } from "../utils.js";
+
+type DataViewBigInt64Getter = (dataView: DataView, byteOffset: number, littleEndian: boolean | undefined) => bigint;
+
+type DataViewBigInt64Setter = (dataView: DataView, byteOffset: number, value: bigint, littleEndian: boolean | undefined) => void;
+
+export class BigIntFieldType {
+    public readonly TTypeScriptType!: bigint;
+
+    public readonly size: number;
+
+    public readonly getter: DataViewBigInt64Getter;
+
+    public readonly setter: DataViewBigInt64Setter;
+
+    public constructor(
+        size: number,
+        getter: DataViewBigInt64Getter,
+        setter: DataViewBigInt64Setter,
+    ) {
+        this.size = size;
+        this.getter = getter;
+        this.setter = setter;
+    }
+
+    public static readonly Int64 = new BigIntFieldType(8, getBigInt64, setBigInt64);
+
+    public static readonly Uint64 = new BigIntFieldType(8, getBigUint64, setBigUint64);
+}
+
+export class BigIntFieldDefinition<
+    TType extends BigIntFieldType = BigIntFieldType,
+    TTypeScriptType = TType["TTypeScriptType"],
+    > extends StructFieldDefinition<
+    void,
+    TTypeScriptType
+    > {
+    public readonly type: TType;
+
+    public constructor(type: TType, _typescriptType?: TTypeScriptType) {
+        super();
+        this.type = type;
+    }
+
+    public getSize(): number {
+        return this.type.size;
+    }
+
+    public create(
+        options: Readonly<StructOptions>,
+        struct: StructValue,
+        value: TTypeScriptType,
+    ): BigIntFieldValue<this> {
+        return new BigIntFieldValue(this, options, struct, value);
+    }
+
+    public override deserialize(
+        options: Readonly<StructOptions>,
+        stream: StructDeserializeStream,
+        struct: StructValue,
+    ): BigIntFieldValue<this>;
+    public override deserialize(
+        options: Readonly<StructOptions>,
+        stream: StructAsyncDeserializeStream,
+        struct: StructValue,
+    ): Promise<BigIntFieldValue<this>>;
+    public override deserialize(
+        options: Readonly<StructOptions>,
+        stream: StructDeserializeStream | StructAsyncDeserializeStream,
+        struct: StructValue,
+    ): ValueOrPromise<BigIntFieldValue<this>> {
+        return SyncPromise
+            .try(() => {
+                return stream.read(this.getSize());
+            })
+            .then(array => {
+                const view = new DataView(array.buffer, array.byteOffset, array.byteLength);
+                const value = this.type.getter(
+                    view,
+                    0,
+                    options.littleEndian
+                );
+                return this.create(options, struct, value as any);
+            })
+            .valueOrPromise();
+    }
+}
+
+export class BigIntFieldValue<
+    TDefinition extends BigIntFieldDefinition<BigIntFieldType, any>,
+    > extends StructFieldValue<TDefinition> {
+    public serialize(dataView: DataView, offset: number): void {
+        this.definition.type.setter(
+            dataView,
+            offset,
+            this.value!,
+            this.options.littleEndian
+        );
+    }
+}