Removed the file types.ts

ktx2Decoder/src/Transcoders/liteTranscoder.ts

@@ -1,4 +1,3 @@
-import { Nullable } from '../types';
 import { Transcoder, sourceTextureFormat, transcodeTarget } from '../transcoder';
 import { WASMMemoryManager } from '../wasmMemoryManager';
 import { KTX2FileReader, IKTX2_ImageDesc } from '../ktx2FileReader';
@@ -44,7 +43,7 @@ export class LiteTranscoder extends Transcoder {
         this._memoryManager = memoryMgr;
     }
 
-    public transcode(src: sourceTextureFormat, dst: transcodeTarget, level: number, width: number, height: number, uncompressedByteLength: number, ktx2Reader: KTX2FileReader, imageDesc: Nullable<IKTX2_ImageDesc>, encodedData: Uint8Array): Promise<Nullable<Uint8Array>> {
+    public transcode(src: sourceTextureFormat, dst: transcodeTarget, level: number, width: number, height: number, uncompressedByteLength: number, ktx2Reader: KTX2FileReader, imageDesc: IKTX2_ImageDesc | null, encodedData: Uint8Array): Promise<Uint8Array | null> {
         return this._loadModule().then((moduleWrapper: any) => {
             const transcoder: any = moduleWrapper.module;
 

ktx2Decoder/src/Transcoders/mscTranscoder.ts

@@ -1,4 +1,3 @@
-import { Nullable } from '../types';
 import { Transcoder, sourceTextureFormat, transcodeTarget } from '../transcoder';
 import { KTX2FileReader, IKTX2_ImageDesc } from '../ktx2FileReader';
 import { WASMMemoryManager } from '../wasmMemoryManager';
@@ -50,7 +49,7 @@ export class MSCTranscoder extends Transcoder {
         return true;
     }
 
-    public transcode(src: sourceTextureFormat, dst: transcodeTarget, level: number, width: number, height: number, uncompressedByteLength: number, ktx2Reader: KTX2FileReader, imageDesc: Nullable<IKTX2_ImageDesc>, encodedData: Uint8Array): Promise<Nullable<Uint8Array>> {
+    public transcode(src: sourceTextureFormat, dst: transcodeTarget, level: number, width: number, height: number, uncompressedByteLength: number, ktx2Reader: KTX2FileReader, imageDesc: IKTX2_ImageDesc | null, encodedData: Uint8Array): Promise<Uint8Array | null> {
         const isVideo = false;
 
         return this._getMSCBasisTranscoder().then(() => {

ktx2Decoder/src/ktx2Decoder.ts

@@ -14,7 +14,6 @@ import { LiteTranscoder_UASTC_ASTC } from './Transcoders/liteTranscoder_UASTC_AS
 import { LiteTranscoder_UASTC_BC7 } from './Transcoders/liteTranscoder_UASTC_BC7';
 import { MSCTranscoder } from './Transcoders/mscTranscoder';
 import { transcodeTarget, sourceTextureFormat } from './transcoder';
-import { Nullable } from './types';
 import { ZSTDDecoder } from './zstddec';
 
 const COMPRESSED_RGBA_BPTC_UNORM_EXT = 0x8E8C;
@@ -38,7 +37,7 @@ export interface IDecodedData {
 }
 
 export interface IMipmap {
-    data: Nullable<Uint8Array>;
+    data: Uint8Array | null;
     width: number;
     height: number;
 }
@@ -68,7 +67,7 @@ export class KTX2Decoder {
         this._transcoderMgr = new TranscoderManager();
     }
 
-    public decode(data: Uint8Array, caps: ICompressedFormatCapabilities): Nullable<Promise<IDecodedData>> {
+    public decode(data: Uint8Array, caps: ICompressedFormatCapabilities): Promise<IDecodedData | null> {
         const kfr = new KTX2FileReader(data);
 
         if (!kfr.isValid()) {
@@ -129,7 +128,7 @@ export class KTX2Decoder {
         }
 
         const mipmaps: Array<IMipmap> = [];
-        const dataPromises: Array<Promise<Nullable<Uint8Array>>> = [];
+        const dataPromises: Array<Promise<Uint8Array | null>> = [];
         const mipmapBuffers: Array<ArrayBuffer> = [];
         const decodedData: IDecodedData = { width: 0, height: 0, transcodedFormat, mipmaps, isInGammaSpace: kfr.isInGammaSpace };
 
@@ -165,7 +164,7 @@ export class KTX2Decoder {
 
             for (let imageIndex = 0; imageIndex < numImagesInLevel; imageIndex ++) {
                 let encodedData: Uint8Array;
-                let imageDesc: Nullable<IKTX2_ImageDesc> = null;
+                let imageDesc: IKTX2_ImageDesc | null = null;
 
                 if (kfr.header.supercompressionScheme === SupercompressionScheme.BasisLZ) {
                     imageDesc = kfr.supercompressionGlobalData.imageDescs![firstImageDescIndex + imageIndex];

ktx2Decoder/src/transcoder.ts

@@ -1,4 +1,3 @@
-import { Nullable } from './types';
 import { WASMMemoryManager } from './wasmMemoryManager';
 import { KTX2FileReader, IKTX2_ImageDesc } from './ktx2FileReader';
 
@@ -44,7 +43,7 @@ export class Transcoder {
     public setMemoryManager(memoryMgr: WASMMemoryManager): void {
     }
 
-    public transcode(src: sourceTextureFormat, dst: transcodeTarget, level: number, width: number, height: number, uncompressedByteLength: number, ktx2Reader: KTX2FileReader, imageDesc: Nullable<IKTX2_ImageDesc>, encodedData: Uint8Array): Promise<Nullable<Uint8Array>> {
+    public transcode(src: sourceTextureFormat, dst: transcodeTarget, level: number, width: number, height: number, uncompressedByteLength: number, ktx2Reader: KTX2FileReader, imageDesc: IKTX2_ImageDesc | null, encodedData: Uint8Array): Promise<Uint8Array | null> {
         return Promise.resolve(null);
     }
 }

ktx2Decoder/src/transcoderManager.ts

@@ -1,5 +1,4 @@
 import { transcodeTarget, sourceTextureFormat, Transcoder } from './transcoder';
-import { Nullable } from './types';
 import { WASMMemoryManager } from './wasmMemoryManager';
 
 /**
@@ -17,8 +16,8 @@ export class TranscoderManager {
 
     private _wasmMemoryManager: WASMMemoryManager;
 
-    public findTranscoder(src: sourceTextureFormat, dst: transcodeTarget): Nullable<Transcoder> {
-        let transcoder: Nullable<Transcoder> = null;
+    public findTranscoder(src: sourceTextureFormat, dst: transcodeTarget): Transcoder | null {
+        let transcoder: Transcoder | null = null;
 
         for (let i = 0; i < TranscoderManager._Transcoders.length; ++i) {
             if (TranscoderManager._Transcoders[i].CanTranscode(src, dst)) {

ktx2Decoder/src/types.ts

@@ -1,63 +0,0 @@
-/** Alias type for value that can be null */
-export type Nullable<T> = T | null;
-/**
- * Alias type for number that are floats
- * @ignorenaming
- */
-export type float = number;
-/**
- * Alias type for number that are doubles.
- * @ignorenaming
- */
-export type double = number;
-/**
- * Alias type for number that are integer
- * @ignorenaming
- */
-export type int = number;
-
-/** Alias type for number array or Float32Array */
-export type FloatArray = number[] | Float32Array;
-/** Alias type for number array or Float32Array or Int32Array or Uint32Array or Uint16Array */
-export type IndicesArray = number[] | Int32Array | Uint32Array | Uint16Array;
-
-/**
- * Alias for types that can be used by a Buffer or VertexBuffer.
- */
-export type DataArray = number[] | ArrayBuffer | ArrayBufferView;
-
-/**
- * Alias type for primitive types
- * @ignorenaming
- */
-type Primitive = undefined | null | boolean | string | number | Function;
-
-/**
- * Type modifier to make all the properties of an object Readonly
- */
-export type Immutable<T> = T extends Primitive
-  ? T
-  : T extends Array<infer U>
-  ? ReadonlyArray<U>
-  : /* T extends Map<infer K, infer V> ? ReadonlyMap<K, V> : // es2015+ only */
-  DeepImmutable<T>;
-
-/**
- * Type modifier to make all the properties of an object Readonly recursively
- */
-export type DeepImmutable<T> = T extends Primitive
-  ? T
-  : T extends Array<infer U>
-  ? DeepImmutableArray<U>
-  : /* T extends Map<infer K, infer V> ? DeepImmutableMap<K, V> : // es2015+ only */
-  DeepImmutableObject<T>;
-
-/**
- * Type modifier to make object properties readonly.
- */
-export type DeepImmutableObject<T> = { readonly [K in keyof T]: DeepImmutable<T[K]> };
-
-/** @hidden */
-interface DeepImmutableArray<T> extends ReadonlyArray<DeepImmutable<T>> { }
-/** @hidden */
-/* interface DeepImmutableMap<K, V> extends ReadonlyMap<DeepImmutable<K>, DeepImmutable<V>> {} // es2015+ only */