diff --git a/packages/adb/package.json b/packages/adb/package.json index d35b1e2f..9cbadb6b 100644 --- a/packages/adb/package.json +++ b/packages/adb/package.json @@ -26,6 +26,7 @@ "dependencies": { "@yume-chan/async-operation-manager": "^2.0.0", "@yume-chan/event": "^0.0.1", + "@yume-chan/struct": "^0.0.0", "tslib": "^2.0.1" } } diff --git a/packages/adb/src/sync.ts b/packages/adb/src/sync.ts index 7a4c3709..077ffe70 100644 --- a/packages/adb/src/sync.ts +++ b/packages/adb/src/sync.ts @@ -1,7 +1,8 @@ import { AutoDisposable } from '@yume-chan/event'; +import { Struct, StructInitType, StructValueType } from '@yume-chan/struct'; import { AdbBufferedStream } from './buffered-stream'; import { AdbStream } from './stream'; -import { AutoResetEvent, Struct, StructInitType, StructValueType } from './utils'; +import { AutoResetEvent } from './utils'; export enum AdbSyncRequestId { List = 'LIST', diff --git a/packages/adb/src/utils/index.ts b/packages/adb/src/utils/index.ts index 5d7d3c1f..dd33d06f 100644 --- a/packages/adb/src/utils/index.ts +++ b/packages/adb/src/utils/index.ts @@ -1,5 +1,3 @@ export * from './auto-reset-event'; export * from './base64'; export * from './event-iterator'; -export * from './struct'; -export { default as Struct } from './struct'; diff --git a/packages/adb/tsconfig.json b/packages/adb/tsconfig.json index fc6f450a..8617f539 100644 --- a/packages/adb/tsconfig.json +++ b/packages/adb/tsconfig.json @@ -7,6 +7,9 @@ "references": [ { "path": "../event/tsconfig.json" + }, + { + "path": "../struct/tsconfig.json" } ] } diff --git a/packages/struct/README.md b/packages/struct/README.md new file mode 100644 index 00000000..bdf912f1 --- /dev/null +++ b/packages/struct/README.md @@ -0,0 +1,11 @@ +# `struct` + +> TODO: description + +## Usage + +``` +const struct = require('struct'); + +// TODO: DEMONSTRATE API +``` diff --git a/packages/struct/package-lock.json b/packages/struct/package-lock.json new file mode 100644 index 00000000..afcdd55e --- /dev/null +++ b/packages/struct/package-lock.json @@ -0,0 +1,19 @@ +{ + "name": "@yume-chan/struct", + "version": "0.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "tslib": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + }, + "typescript": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", + "dev": true + } + } +} diff --git a/packages/struct/package.json b/packages/struct/package.json new file mode 100644 index 00000000..77814939 --- /dev/null +++ b/packages/struct/package.json @@ -0,0 +1,30 @@ +{ + "name": "@yume-chan/struct", + "version": "0.0.0", + "description": "Easy to use C structure serializer and deserializer", + "keywords": [ + "structure", + "typescript" + ], + "author": "Simon Chan ", + "homepage": "https://github.com/yume-chan/ya-webadb#readme", + "license": "MIT", + "main": "lib/index.js", + "repository": { + "type": "git", + "url": "git+https://github.com/yume-chan/ya-webadb.git" + }, + "scripts": { + "build": "tsc -b", + "build:watch": "tsc -b -w" + }, + "bugs": { + "url": "https://github.com/yume-chan/ya-webadb/issues" + }, + "devDependencies": { + "typescript": "4.0.3" + }, + "dependencies": { + "tslib": "2.0.1" + } +} diff --git a/packages/struct/src/index.ts b/packages/struct/src/index.ts new file mode 100644 index 00000000..d332e6df --- /dev/null +++ b/packages/struct/src/index.ts @@ -0,0 +1,2 @@ +export * from './struct'; +export { default as Struct } from './struct'; diff --git a/packages/adb/src/utils/struct.ts b/packages/struct/src/struct.ts similarity index 100% rename from packages/adb/src/utils/struct.ts rename to packages/struct/src/struct.ts diff --git a/packages/struct/tsconfig.json b/packages/struct/tsconfig.json new file mode 100644 index 00000000..cf5fd431 --- /dev/null +++ b/packages/struct/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "lib", // /* Redirect output structure to the directory. */ + "rootDir": "./src", // /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + } +}