From bfd7eeb9e10d22cd9ad5cff46d19820e290fdefa Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Wed, 16 Jul 2025 18:11:24 +0300 Subject: [PATCH] Remove NullishType alias Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICH95I Testing: all pre-merge tests passed Signed-off-by: igorlegalov --- .../ani/ets/@ohos.file.environment.ets | 8 +- .../js/src/mod_fs/ani/ets/@ohos.file.fs.ets | 188 +++++++++--------- .../src/mod_hash/ani/ets/@ohos.file.hash.ets | 4 +- .../ani/ets/@ohos.file.securityLabel.ets | 8 +- .../ani/ets/@ohos.file.statvfs.ets | 8 +- 5 files changed, 108 insertions(+), 108 deletions(-) diff --git a/interfaces/kits/js/src/mod_environment/ani/ets/@ohos.file.environment.ets b/interfaces/kits/js/src/mod_environment/ani/ets/@ohos.file.environment.ets index 71b8e1c2d..8edfc5055 100644 --- a/interfaces/kits/js/src/mod_environment/ani/ets/@ohos.file.environment.ets +++ b/interfaces/kits/js/src/mod_environment/ani/ets/@ohos.file.environment.ets @@ -19,7 +19,7 @@ namespace Environment { export function getStorageDataDir(): Promise { return new Promise((resolve: (result: string) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute(EnvironmentImpl.getStorageDataDirSync); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as string; resolve(result); }).catch((e: Error): void => { @@ -30,7 +30,7 @@ namespace Environment { export function getStorageDataDir(callback: AsyncCallback): void { let promise = taskpool.execute(EnvironmentImpl.getStorageDataDirSync); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as string; @@ -43,7 +43,7 @@ namespace Environment { export function getUserDataDir(): Promise { return new Promise((resolve: (result: string) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute(EnvironmentImpl.getUserDataDirSync); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as string; resolve(result); }).catch((e: Error): void => { @@ -53,7 +53,7 @@ namespace Environment { } export function getUserDataDir(callback: AsyncCallback): void { let promise = taskpool.execute(EnvironmentImpl.getUserDataDirSync); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as string; diff --git a/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets b/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets index 610c1094f..93813679b 100644 --- a/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets +++ b/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets @@ -44,7 +44,7 @@ function access(path: string, mode?: AccessModeType): Promise { let promise = taskpool.execute((path: string, mode?: AccessModeType): boolean => { return FileIoImpl.doAccessSync(path, mode); }, path, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as boolean; resolve(result); }).catch((e: Error): void => { @@ -57,7 +57,7 @@ function access(path: string, callback: AsyncCallback): void { let promise = taskpool.execute((path: string): boolean => { return FileIoImpl.doAccessSync(path); }, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as boolean; @@ -72,7 +72,7 @@ function access(path: string, mode: AccessModeType, flag: AccessFlagType): Promi let promise = taskpool.execute((path: string, mode: AccessModeType, flag: AccessFlagType): boolean => { return FileIoImpl.doAccessSync(path, mode, flag); }, path, mode, flag); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as boolean; resolve(result); }).catch((e: Error): void => { @@ -92,7 +92,7 @@ function accessSync(path: string, mode: AccessModeType, flag: AccessFlagType): b function close(file: number | File): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((file: number | File): undefined => FileIoImpl.closeSync(file), file); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -102,7 +102,7 @@ function close(file: number | File): Promise { function close(file: number | File, callback: AsyncCallback): void { let promise = taskpool.execute((file: number | File): undefined => FileIoImpl.closeSync(file), file); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -147,7 +147,7 @@ function getxattr(path: string, key: string): Promise { let promise = taskpool.execute((path: string, key: string): string => { return FileIoImpl.getxattrSync(path, key); }, path, key); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as string; resolve(result); }).catch((e: Error): void => { @@ -169,7 +169,7 @@ function copyDir(src: string, dest: string, mode?: number): Promise { reject: (e: BusinessError>) => void): void => { let promise = taskpool.execute((src: string, dest: string, mode?: number): undefined => FileIoImpl.copyDirSync(src, dest, mode), src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError>); @@ -180,7 +180,7 @@ function copyDir(src: string, dest: string, mode?: number): Promise { function copyDir(src: string, dest: string, callback: AsyncCallback>): void { let promise = taskpool.execute((src: string, dest: string): undefined => FileIoImpl.copyDirSync(src, dest), src, dest); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError>(); e.code = 0; e.data = new Array(0); @@ -193,7 +193,7 @@ function copyDir(src: string, dest: string, callback: AsyncCallback>): void { let promise = taskpool.execute((src: string, dest: string, mode: number): undefined => FileIoImpl.copyDirSync(src, dest, mode), src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError>(); e.code = 0; e.data = new Array(0); @@ -203,7 +203,7 @@ function copyDir(src: string, dest: string, mode: number, callback: AsyncCallbac }); } -function copyDir(arg0: Object, arg1: Object, arg2: NullishType, arg3: NullishType): void { +function copyDir(arg0: Object, arg1: Object, arg2: Any, arg3: Any): void { let src = arg0 as string; let dest = arg1 as string; if (typeof arg2 === 'number' && typeof arg3 === 'function') { @@ -235,7 +235,7 @@ function fdatasyncSync(fd: number): void { function fdatasync(fd: number): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((fd: number): undefined => FileIoImpl.fdatasyncSync(fd), fd); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -245,7 +245,7 @@ function fdatasync(fd: number): Promise { function fdatasync(fd: number, callback: AsyncCallback): void { let promise = taskpool.execute((fd: number): undefined => FileIoImpl.fdatasyncSync(fd), fd); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -271,7 +271,7 @@ function mkdirSync2(path: string, recursion: boolean): undefined { function mkdir(path: string): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((path: string): undefined => mkdirSync1(path), path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -281,7 +281,7 @@ function mkdir(path: string): Promise { function mkdir(path: string, callback: AsyncCallback): void { let promise = taskpool.execute((path: string): undefined => mkdirSync1(path), path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -294,9 +294,9 @@ function mkdir(path: string, recursion: boolean): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((path: string, recursion: boolean): undefined => mkdirSync2(path, recursion), path, recursion); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); - }).catch((e: NullishType): void => { + }).catch((e: Any): void => { reject(e as BusinessError); }); }); @@ -305,7 +305,7 @@ function mkdir(path: string, recursion: boolean): Promise { function mkdir(path: string, recursion: boolean, callback: AsyncCallback): void { let promise = taskpool.execute((path: string, recursion: boolean): undefined => mkdirSync2(path, recursion), path, recursion); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -324,7 +324,7 @@ function moveDir(src: string, dest: string, mode?: number): Promise { let promise = taskpool.execute((src: string, dest: string, mode?: number): undefined => { return FileIoImpl.movedirSync(src, dest, mode); }, src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError>); @@ -336,7 +336,7 @@ function moveDir(src: string, dest: string, callback: AsyncCallback { return FileIoImpl.movedirSync(src, dest); }, src, dest); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError>(); e.code = 0; e.data = new Array(0); @@ -350,7 +350,7 @@ function moveDir(src: string, dest: string, mode: number, callback: AsyncCallbac let promise = taskpool.execute((src: string, dest: string, mode: number): undefined => { return FileIoImpl.movedirSync(src, dest, mode); }, src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError>(); e.code = 0; e.data = new Array(0); @@ -360,7 +360,7 @@ function moveDir(src: string, dest: string, mode: number, callback: AsyncCallbac }); } -function moveDir(arg0: Object, arg1: Object, arg2: NullishType, arg3: NullishType): void { +function moveDir(arg0: Object, arg1: Object, arg2: Any, arg3: Any): void { let src = arg0 as string; let dest = arg1 as string; if (typeof arg2 === 'number' && typeof arg3 === 'function') { @@ -390,7 +390,7 @@ function mkdtemp(prefix: string): Promise { let promise = taskpool.execute((prefix: string): string => { return FileIoImpl.mkdtempSync(prefix); }, prefix); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as string; resolve(result); }).catch((e: Error): void => { @@ -403,7 +403,7 @@ function mkdtemp(prefix: string, callback: AsyncCallback): void { let promise = taskpool.execute((prefix: string): string => { return FileIoImpl.mkdtempSync(prefix); }, prefix); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as string; @@ -422,7 +422,7 @@ function moveFile(src: string, dest: string, mode?: number): Promise { let promise = taskpool.execute((src: string, dest: string, mode?: number): undefined => { return FileIoImpl.moveFileSync(src, dest, mode); }, src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -434,7 +434,7 @@ function moveFile(src: string, dest: string, mode: number, callback: AsyncCallba let promise = taskpool.execute((src: string, dest: string, mode: number): undefined => { return FileIoImpl.moveFileSync(src, dest, mode); }, src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -447,7 +447,7 @@ function moveFile(src: string, dest: string, callback: AsyncCallback): voi let promise = taskpool.execute((src: string, dest: string): undefined => { return FileIoImpl.moveFileSync(src, dest); }, src, dest); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -465,7 +465,7 @@ function open(path: String, mode?: number): Promise { let promise = taskpool.execute((path: String, mode?: number): File => { return FileIoImpl.openSync(path, mode); },path, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let file = ret as File; resolve(file); }).catch((e: Error): void => { @@ -478,7 +478,7 @@ function open(path: String, mode: number, callback: AsyncCallback): let promise = taskpool.execute((path: String, mode: number): File => { return FileIoImpl.openSync(path, mode); }, path, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let file = ret as File; @@ -493,7 +493,7 @@ function open(path: String, callback: AsyncCallback): void { let promise = taskpool.execute((path: String): File => { return FileIoImpl.openSync(path); }, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let file = ret as File; @@ -513,7 +513,7 @@ function write(fd: number, buffer: string | ArrayBuffer, options?: WriteOptions) let promise = taskpool.execute((fd: number, buffer: string | ArrayBuffer, options?: WriteOptions): number => { return FileIoImpl.writeSync(fd, buffer, options); }, fd, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as number resolve(result); }).catch((e: Error): void => { @@ -527,7 +527,7 @@ function write(fd: number, buffer: string | ArrayBuffer, options: WriteOptions, let promise = taskpool.execute((fd: number, buffer: string | ArrayBuffer, options: WriteOptions): number => { return FileIoImpl.writeSync(fd, buffer, options); }, fd, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -541,7 +541,7 @@ function write(fd: number, buffer: string | ArrayBuffer, callback: AsyncCallback let promise = taskpool.execute((fd: number, buffer: string | ArrayBuffer): number => { return FileIoImpl.writeSync(fd, buffer); }, fd, buffer); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -560,7 +560,7 @@ function read(fd: number, buffer: ArrayBuffer, options?: ReadOptions): Promise { return FileIoImpl.readSync(fd, buffer, options) }, fd, buffer, options); - promise.then((ret: NullishType) => { + promise.then((ret: Any) => { let result = ret as number; resolve(result); }).catch((e: Error): void => { @@ -573,7 +573,7 @@ function read(fd: number, buffer: ArrayBuffer, callback: AsyncCallback { return FileIoImpl.readSync(fd, buffer); }, fd, buffer); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -587,7 +587,7 @@ function read(fd: number, buffer: ArrayBuffer, options: ReadOptions, callback: A let promise = taskpool.execute((fd: number, buffer: ArrayBuffer, options: ReadOptions): number => { return FileIoImpl.readSync(fd, buffer, options); }, fd, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -607,7 +607,7 @@ function readLines(filePath: string, options?: Options): Promise let promise = taskpool.execute((filePath: string, options?: Options): ReaderIterator => { return FileIoImpl.readlinesSync(filePath, options); }, filePath, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let it = ret as ReaderIterator; resolve(it); }).catch((e: Error): void => { @@ -620,7 +620,7 @@ function readLines(filePath: string, callback: AsyncCallback): v let promise = taskpool.execute((filePath: string): ReaderIterator => { return FileIoImpl.readlinesSync(filePath); }, filePath); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let it = ret as ReaderIterator; @@ -635,7 +635,7 @@ function readLines(filePath: string, options: Options, callback: AsyncCallback { return FileIoImpl.readlinesSync(filePath, options); }, filePath, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let it = ret as ReaderIterator; @@ -654,7 +654,7 @@ function rmdir(path: string): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((path: string): void => FileIoImpl.rmdirSync(path), path); - promise.then((ret: NullishType) => { + promise.then((ret: Any) => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -664,7 +664,7 @@ function rmdir(path: string): Promise { function rmdir(path: string, callback: AsyncCallback): void { let promise = taskpool.execute((path: string): void => FileIoImpl.rmdirSync(path), path); - promise.then((ret: NullishType) => { + promise.then((ret: Any) => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -682,7 +682,7 @@ function truncate(file: string | number, len?: number): Promise { let promise = taskpool.execute((file: string | number, len?: number): undefined => { return FileIoImpl.truncateSync(file, len); }, file, len); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -694,7 +694,7 @@ function truncate(file: string | number, callback: AsyncCallback): void { let promise = taskpool.execute((file: string | number): undefined => { return FileIoImpl.truncateSync(file); }, file); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -707,7 +707,7 @@ function truncate(file: string | number, len: number, callback: AsyncCallback { return FileIoImpl.truncateSync(file, len); }, file, len); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -724,7 +724,7 @@ function unlink(path: string): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((path: string): undefined => unlinkSync(path), path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -734,7 +734,7 @@ function unlink(path: string): Promise { function unlink(path: string, callback: AsyncCallback): void { let promise = taskpool.execute((path: string): undefined => unlinkSync(path), path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -748,7 +748,7 @@ function readText(filePath: string, options?: ReadTextOptions): Promise let promise = taskpool.execute((filePath: string, options?: ReadTextOptions): string => { return FileIoImpl.readTextSync(filePath, options); }, filePath, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let r = ret as string; resolve(r); }).catch((e: Error): void => { @@ -761,7 +761,7 @@ function readText(filePath: string, callback: AsyncCallback): void { let promise = taskpool.execute((filePath: string): string => { return FileIoImpl.readTextSync(filePath); }, filePath); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let r = ret as string; @@ -775,7 +775,7 @@ function readText(filePath: string, options: ReadTextOptions, callback: AsyncCal let promise = taskpool.execute((filePath: string, options: ReadTextOptions): string => { return FileIoImpl.readTextSync(filePath, options); }, filePath, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let r = ret as string; @@ -794,7 +794,7 @@ function listFile(path: string, options?: ListFileOptions): Promise { let promise = taskpool.execute((path: string, options?: ListFileOptions): string[] => { return FileIoImpl.listFileSync(path, options); }, path, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let r = ret as string[]; resolve(r); }).catch((e: Error): void => { @@ -807,7 +807,7 @@ function listFile(path: string, callback: AsyncCallback): void { let promise = taskpool.execute((path: string): string[] => { return FileIoImpl.listFileSync(path); }, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let r = ret as string[]; @@ -821,7 +821,7 @@ function listFile(path: string, options: ListFileOptions, callback: AsyncCallbac let promise = taskpool.execute((path: string, options: ListFileOptions): string[] => { return FileIoImpl.listFileSync(path, options); }, path, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let r = ret as string[]; @@ -848,7 +848,7 @@ function stat(file: string | number): Promise { let promise = taskpool.execute((file: string | number): Stat => { return FileIoImpl.statSync(file); }, file); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let r = ret as Stat; resolve(r); }).catch((e: Error): void => { @@ -861,7 +861,7 @@ function stat(file: string | number, callback: AsyncCallback): void let p = taskpool.execute((file: string | number): Stat => { return FileIoImpl.statSync(file); }, file); - p.then((ret: NullishType): void => { + p.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let r = ret as Stat; @@ -880,7 +880,7 @@ function fsync(fd: number): Promise { let promise = taskpool.execute((fd: number): undefined => { return FileIoImpl.fsyncSync(fd); }, fd); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -892,7 +892,7 @@ function fsync(fd: number, callback: AsyncCallback): void { let promise = taskpool.execute((fd: number): undefined => { return FileIoImpl.fsyncSync(fd); }, fd); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -911,7 +911,7 @@ function symlink(target: string, srcPath: string): Promise { let promise = taskpool.execute((target: string, srcPath: string): undefined => { return FileIoImpl.symlinkSync(target, srcPath); }, target, srcPath); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -927,7 +927,7 @@ function rename(oldPath: string, newPath: string): Promise { let promise = taskpool.execute((oldPath: string, newPath: string): undefined => { return FileIoImpl.renameSync(oldPath, newPath); }, oldPath, newPath); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -939,7 +939,7 @@ function rename(oldPath: string, newPath: string, callback: AsyncCallback) let promise = taskpool.execute((oldPath: string, newPath: string): undefined => { return FileIoImpl.renameSync(oldPath, newPath); }, oldPath, newPath); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -961,7 +961,7 @@ function createRandomAccessFile(file: string | File, mode?: number, options?: RandomAccessFileOptions): RandomAccessFile => { return FileIoImpl.createRandomAccessFileSync(file, mode, options); }, file, mode, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let raffile = ret as RandomAccessFileInner; resolve(raffile); }).catch((e: Error): void => { @@ -975,7 +975,7 @@ function fdopenStream(fd: number, mode: string): Promise { let promise = taskpool.execute((fd: number, mode: string): Stream => { return FileIoImpl.fdopenStreamSync(fd, mode); }, fd, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let stream = ret as Stream; resolve(stream); }).catch((e: Error): void => { @@ -992,7 +992,7 @@ function setxattr(path: string, key: string, value: string): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((path: string, key: string, value: string): undefined => FileIoImpl.setxattrSync(path, key, value), path, key, value); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -1004,7 +1004,7 @@ function createRandomAccessFile(file: string | File, callback: AsyncCallback { return FileIoImpl.createRandomAccessFileSync(file); }, file); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let raffile = ret as RandomAccessFile; @@ -1020,7 +1020,7 @@ function createRandomAccessFile(file: string | File, mode: number, let promise = taskpool.execute((file: string | File, mode: number): RandomAccessFile => { return FileIoImpl.createRandomAccessFileSync(file, mode); }, file, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let raffile = ret as RandomAccessFile; @@ -1035,7 +1035,7 @@ function fdopenStream(fd: number, mode: string, callback: AsyncCallback) let promise = taskpool.execute((fd: number, mode: string): Stream => { return FileIoImpl.fdopenStreamSync(fd, mode); }, fd, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let stream = ret as Stream; @@ -1055,7 +1055,7 @@ function createStream(path: string, mode: string): Promise { let promise = taskpool.execute((path: string, mode: string): Stream => { return FileIoImpl.createStreamSync(path, mode); }, path, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let stream = ret as Stream; resolve(stream); }).catch((e: Error): void => { @@ -1068,7 +1068,7 @@ function createStream(path: string, mode: string, callback: AsyncCallback { return FileIoImpl.createStreamSync(path, mode); }, path, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let stream = ret as Stream; @@ -1099,7 +1099,7 @@ function symlink(target: string, srcPath: string, callback: AsyncCallback) let promise = taskpool.execute((target: string, srcPath: string): undefined => { return FileIoImpl.symlinkSync(target, srcPath); }, target, srcPath); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1121,7 +1121,7 @@ function lstat(path: string): Promise { let promise = taskpool.execute((path: string): Stat => { return FileIoImpl.lstatSync(path); }, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { if (ret === null || ret === undefined) { let e = new BusinessError(); e.code = -1; @@ -1140,7 +1140,7 @@ function lstat(path: string, callback: AsyncCallback): void { let p = taskpool.execute((path: string): Stat => { return FileIoImpl.lstatSync(path); }, path); - p.then((ret: NullishType): void => { + p.then((ret: Any): void => { let e = new BusinessError(); if (ret === null || ret === undefined) { e.code = -1; @@ -1159,7 +1159,7 @@ function copyFile(src: string | number, dest: string | number, mode?: number): P return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((src: string | number, dest: string | number, mode?: number): undefined => FileIoImpl.copyFileSync(src, dest, mode), src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -1171,7 +1171,7 @@ function copy(srcUri: string, destUri: string, options?: CopyOptions): Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((srcUri: string, destUri: string, options?: CopyOptions): undefined => FileIoImpl.copySync(srcUri, destUri, options), srcUri, destUri, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -1182,7 +1182,7 @@ function copy(srcUri: string, destUri: string, options?: CopyOptions): Promise): void { let promise = taskpool.execute((src: string | number, dest: string | number, mode: number): undefined => FileIoImpl.copyFileSync(src, dest, mode), src, dest, mode); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1194,7 +1194,7 @@ function copyFile(src: string | number, dest: string | number, mode: number, cal function copy(srcUri: string, destUri: string, options: CopyOptions, callback: AsyncCallback): void { let promise = taskpool.execute((srcUri: string, destUri: string, options: CopyOptions): undefined => FileIoImpl.copySync(srcUri, destUri, options), srcUri, destUri, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1206,7 +1206,7 @@ function copy(srcUri: string, destUri: string, options: CopyOptions, callback: A function copyFile(src: string | number, dest: string | number, callback: AsyncCallback): void { let promise = taskpool.execute((src: string | number, dest: string | number): undefined => FileIoImpl.copyFileSync(src, dest), src, dest); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1218,7 +1218,7 @@ function copyFile(src: string | number, dest: string | number, callback: AsyncCa function copy(srcUri: string, destUri: string, callback: AsyncCallback): void { let promise = taskpool.execute((srcUri: string, destUri: string): undefined => FileIoImpl.copySync(srcUri, destUri), srcUri, destUri); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1358,7 +1358,7 @@ export class RandomAccessFileInner implements RandomAccessFile { let promise = taskpool.execute((buffer: ArrayBuffer | string, options?: WriteOptions): number => { return this.writeSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as number resolve(result); }).catch((e: Error): void => { @@ -1371,7 +1371,7 @@ export class RandomAccessFileInner implements RandomAccessFile { let promise = taskpool.execute((buffer: ArrayBuffer | string, options: WriteOptions): number => { return this.writeSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -1385,7 +1385,7 @@ export class RandomAccessFileInner implements RandomAccessFile { let promise = taskpool.execute((buffer: ArrayBuffer | string): number => { return this.writeSync(buffer); }, buffer); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -1408,7 +1408,7 @@ export class RandomAccessFileInner implements RandomAccessFile { let promise = taskpool.execute((buffer: ArrayBuffer, options?: ReadOptions): number => { return this.readSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as number; resolve(result); }).catch((e: Error): void => { @@ -1421,7 +1421,7 @@ export class RandomAccessFileInner implements RandomAccessFile { let promise = taskpool.execute((buffer: ArrayBuffer, options: ReadOptions): number => { return this.readSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -1435,7 +1435,7 @@ export class RandomAccessFileInner implements RandomAccessFile { let promise = taskpool.execute((buffer: ArrayBuffer): number => { return this.readSync(buffer); }, buffer); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -1483,7 +1483,7 @@ export class FileInner implements File { let promise = taskpool.execute((exclusive?: boolean): undefined => { return this.lockSync(exclusive); }, exclusive); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -1495,7 +1495,7 @@ export class FileInner implements File { let promise = taskpool.execute((): undefined => { return this.lockSync(); }); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1508,7 +1508,7 @@ export class FileInner implements File { let promise = taskpool.execute((exclusive: boolean): undefined => { return this.lockSync(exclusive); }, exclusive); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1641,7 +1641,7 @@ export class StreamInner implements Stream { close(): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((): undefined => this.closeSync()); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -1651,7 +1651,7 @@ export class StreamInner implements Stream { close(callback: AsyncCallback): void { let promise = taskpool.execute((): undefined => this.closeSync()); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1665,7 +1665,7 @@ export class StreamInner implements Stream { flush(): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((): undefined => this.flushSync()); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -1675,7 +1675,7 @@ export class StreamInner implements Stream { flush(callback: AsyncCallback): void { let promise = taskpool.execute((): undefined => this.flushSync()); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -1691,7 +1691,7 @@ export class StreamInner implements Stream { let promise = taskpool.execute((buffer: ArrayBuffer | string, options?: WriteOptions): number => { return this.writeSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as number resolve(result); }).catch((e: Error): void => { @@ -1704,7 +1704,7 @@ export class StreamInner implements Stream { let promise = taskpool.execute((buffer: ArrayBuffer | string): number => { return this.writeSync(buffer); }, buffer); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -1718,7 +1718,7 @@ export class StreamInner implements Stream { let promise = taskpool.execute((buffer: ArrayBuffer | string, options: WriteOptions): number => { return this.writeSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -1735,7 +1735,7 @@ export class StreamInner implements Stream { let promise = taskpool.execute((buffer: ArrayBuffer, options?: ReadOptions): number => { return this.readSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as number resolve(result); }).catch((e: Error): void => { @@ -1748,7 +1748,7 @@ export class StreamInner implements Stream { let promise = taskpool.execute((buffer: ArrayBuffer): number => { return this.readSync(buffer); }, buffer); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -1762,7 +1762,7 @@ export class StreamInner implements Stream { let promise = taskpool.execute((buffer: ArrayBuffer, options: ReadOptions): number => { return this.readSync(buffer, options); }, buffer, options); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; diff --git a/interfaces/kits/js/src/mod_hash/ani/ets/@ohos.file.hash.ets b/interfaces/kits/js/src/mod_hash/ani/ets/@ohos.file.hash.ets index c9b4d5840..7b0354a7c 100644 --- a/interfaces/kits/js/src/mod_hash/ani/ets/@ohos.file.hash.ets +++ b/interfaces/kits/js/src/mod_hash/ani/ets/@ohos.file.hash.ets @@ -20,7 +20,7 @@ export default namespace hash { export function hash(path: string, algorithm: string): Promise { return new Promise((resolve: (result: string) => void, reject: (e: BusinessError) => void) => { let promise = taskpool.execute(HashImpl.hashSync, path, algorithm); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let res = ret as string; resolve(res); }).catch((e: Error): void => { @@ -31,7 +31,7 @@ export default namespace hash { export function hash(path: string, algorithm: string, callback: AsyncCallback): void { let promise = taskpool.execute(HashImpl.hashSync, path, algorithm); - promise.then((ret: NullishType) => { + promise.then((ret: Any) => { let e = new BusinessError(); e.code = 0; let res = ret as string; diff --git a/interfaces/kits/js/src/mod_securitylabel/ani/ets/@ohos.file.securityLabel.ets b/interfaces/kits/js/src/mod_securitylabel/ani/ets/@ohos.file.securityLabel.ets index 4f81cef3d..12a950215 100644 --- a/interfaces/kits/js/src/mod_securitylabel/ani/ets/@ohos.file.securityLabel.ets +++ b/interfaces/kits/js/src/mod_securitylabel/ani/ets/@ohos.file.securityLabel.ets @@ -21,7 +21,7 @@ namespace securityLabel { export function setSecurityLabel(path: string, type: DataLevel): Promise { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((path: string, type: DataLevel): void => SecurityLabelImpl.setSecurityLabelSync(path, type), path, type); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { resolve(undefined); }).catch((e: Error): void => { reject(e as BusinessError); @@ -31,7 +31,7 @@ namespace securityLabel { export function setSecurityLabel(path: string, type: DataLevel, callback: AsyncCallback): void { let promise = taskpool.execute((path: string, type: DataLevel): void => SecurityLabelImpl.setSecurityLabelSync(path, type), path, type); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); @@ -47,7 +47,7 @@ namespace securityLabel { export function getSecurityLabel(path: string): Promise { return new Promise((resolve: (result: string) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((path: string): string => SecurityLabelImpl.getSecurityLabelSync(path), path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let r = ret as string; resolve(r); }).catch((e: Error): void => { @@ -58,7 +58,7 @@ namespace securityLabel { export function getSecurityLabel(path: string, callback: AsyncCallback): void { let promise = taskpool.execute((path: string): string => SecurityLabelImpl.getSecurityLabelSync(path), path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let r = ret as string; diff --git a/interfaces/kits/js/src/mod_statvfs/ani/ets/@ohos.file.statvfs.ets b/interfaces/kits/js/src/mod_statvfs/ani/ets/@ohos.file.statvfs.ets index f3c569c80..2e895b477 100644 --- a/interfaces/kits/js/src/mod_statvfs/ani/ets/@ohos.file.statvfs.ets +++ b/interfaces/kits/js/src/mod_statvfs/ani/ets/@ohos.file.statvfs.ets @@ -23,7 +23,7 @@ namespace statfs { export function getFreeSize(path: string): Promise { return new Promise((resolve: (result: number) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute(StatvfsImpl.getFreeSizeSync, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as number resolve(result); }).catch((e: Error): void => { @@ -34,7 +34,7 @@ namespace statfs { export function getFreeSize(path: string, callback: AsyncCallback): void { let promise = taskpool.execute(StatvfsImpl.getFreeSizeSync, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; @@ -51,7 +51,7 @@ namespace statfs { export function getTotalSize(path: string): Promise { return new Promise((resolve: (result: number) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute(StatvfsImpl.getTotalSizeSync, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let result = ret as number resolve(result); }).catch((e: Error): void => { @@ -62,7 +62,7 @@ namespace statfs { export function getTotalSize(path: string, callback: AsyncCallback): void { let promise = taskpool.execute(StatvfsImpl.getTotalSizeSync, path); - promise.then((ret: NullishType): void => { + promise.then((ret: Any): void => { let e = new BusinessError(); e.code = 0; let result = ret as number; -- Gitee