Skip to content

Commit 89d81f7

Browse files
garredowgarredow
committed
refactor messaging and schemas
1 parent 5c5b7e1 commit 89d81f7

12 files changed

Lines changed: 344 additions & 170 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# kaiware-lib
22

3-
![build](https://github.com/nothingspecialdev/kaiware-lib/actions/workflows/build.yml/badge.svg)
3+
![build](https://github.com/nothingspecialdev/kaiware-lib/actions/workflows/build.yml/badge.svg)
4+
![NPM Version](https://img.shields.io/npm/v/%40nothing-special%2Fkaiware-lib)

‎package.json‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nothing-special/kaiware-lib",
3-
"version": "0.3.0",
3+
"version": "0.4.0",
44
"type": "module",
55
"author": {
66
"name": "Garrett Downs",
@@ -26,16 +26,34 @@
2626
"index.d.ts"
2727
],
2828
"types": "./build/src/index.d.ts",
29+
"module": "./build/src/index.mjs",
30+
"main": "./build/src/index.cjs",
2931
"exports": {
3032
".": {
31-
"types": "./build/esm/src/index.d.ts",
32-
"import": "./build/esm/src/index.js",
33-
"require": "./build/cjs/src/index.js"
33+
"types": "./build/src/index.d.ts",
34+
"import": "./build/src/index.mjs",
35+
"require": "./build/src/index.cjs"
3436
},
35-
"./lib": "./build/esm/src/lib/index.js",
36-
"./types": "./build/esm/src/types/index.js",
37-
"./enums": "./build/esm/src/enums/index.js",
38-
"./utils": "./build/esm/src/utils/index.js"
37+
"./lib": {
38+
"types": "./build/src/lib/index.d.ts",
39+
"import": "./build/src/lib/index.mjs",
40+
"require": "./build/src/lib/index.cjs"
41+
},
42+
"./types": {
43+
"types": "./build/src/types/index.d.ts",
44+
"import": "./build/src/types/index.mjs",
45+
"require": "./build/src/types/index.cjs"
46+
},
47+
"./enums": {
48+
"types": "./build/src/enums/index.d.ts",
49+
"import": "./build/src/enums/index.mjs",
50+
"require": "./build/src/enums/index.cjs"
51+
},
52+
"./utils": {
53+
"types": "./build/src/utils/index.d.ts",
54+
"import": "./build/src/utils/index.mjs",
55+
"require": "./build/src/utils/index.cjs"
56+
}
3957
},
4058
"devDependencies": {
4159
"@babel/plugin-transform-runtime": "^7.24.3",

‎rollup.config.js‎

Lines changed: 51 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,61 @@
1-
import alias from '@rollup/plugin-alias';
21
import babel from '@rollup/plugin-babel';
32
import nodeResolve from '@rollup/plugin-node-resolve';
43
import typescript from '@rollup/plugin-typescript';
5-
import path from 'node:path';
64

7-
/** @type {import('rollup').RollupOptions[]} */
8-
export default [
9-
{
10-
input: [
11-
'src/index.ts',
12-
'src/enums/index.ts',
13-
'src/lib/index.ts',
14-
'src/types/index.ts',
15-
'src/utils/index.ts'
16-
],
17-
output: {
18-
dir: 'build/esm',
5+
/** @type {import('rollup').RollupOptions} */
6+
export default {
7+
input: [
8+
'src/index.ts',
9+
'src/enums/index.ts',
10+
'src/lib/index.ts',
11+
'src/types/index.ts',
12+
'src/utils/index.ts'
13+
],
14+
output: [
15+
{
16+
dir: 'build',
1917
format: 'esm',
2018
preserveModules: true,
21-
exports: 'named'
19+
exports: 'named',
20+
entryFileNames: '[name].mjs'
2221
},
23-
preserveEntrySignatures: 'strict',
24-
plugins: [
25-
typescript({
26-
outDir: 'build/esm/src'
27-
}),
28-
alias({
29-
customResolver: nodeResolve({ extensions: ['.ts', '.js', '.d.ts'] }),
30-
entries: [{ find: 'src', replacement: path.resolve(__dirname, 'build/esm/src') }]
31-
}),
32-
babel({
33-
extensions: ['.js', '.ts', '.mjs', '.cjs', '.html'],
34-
babelHelpers: 'runtime',
35-
exclude: ['node_modules/@babel/**'],
36-
presets: [
37-
[
38-
'@babel/preset-env',
39-
{
40-
targets: { firefox: '48' },
41-
exclude: ['@babel/plugin-transform-regenerator']
42-
}
43-
]
44-
],
45-
plugins: [
46-
'@babel/plugin-syntax-dynamic-import',
47-
[
48-
'@babel/plugin-transform-runtime',
49-
{
50-
useESModules: true,
51-
regenerator: false
52-
}
53-
]
54-
]
55-
}),
56-
nodeResolve()
57-
]
58-
},
59-
{
60-
input: [
61-
'src/index.ts',
62-
'src/enums/index.ts',
63-
'src/lib/index.ts',
64-
'src/types/index.ts',
65-
'src/utils/index.ts'
66-
],
67-
output: {
68-
dir: 'build/cjs',
22+
{
23+
dir: 'build',
6924
format: 'cjs',
7025
preserveModules: true,
71-
exports: 'named'
72-
},
73-
preserveEntrySignatures: 'strict',
74-
plugins: [
75-
alias({
76-
entries: [{ find: '$', replacement: path.resolve(__dirname, 'src') }]
77-
}),
78-
typescript({
79-
outDir: 'build/cjs/src'
80-
}),
81-
babel({
82-
extensions: ['.js', '.ts', '.mjs', '.cjs', '.html'],
83-
babelHelpers: 'runtime',
84-
exclude: ['node_modules/@babel/**'],
85-
presets: [
86-
[
87-
'@babel/preset-env',
88-
{
89-
targets: { firefox: '48' },
90-
exclude: ['@babel/plugin-transform-regenerator']
91-
}
92-
]
93-
],
94-
plugins: [
95-
'@babel/plugin-syntax-dynamic-import',
96-
[
97-
'@babel/plugin-transform-runtime',
98-
{
99-
useESModules: true,
100-
regenerator: false
101-
}
102-
]
26+
exports: 'named',
27+
entryFileNames: '[name].cjs'
28+
}
29+
],
30+
preserveEntrySignatures: 'strict',
31+
plugins: [
32+
nodeResolve({}),
33+
typescript({
34+
outDir: 'build/src'
35+
}),
36+
babel({
37+
extensions: ['.js', '.ts', '.mjs', '.cjs', '.html'],
38+
babelHelpers: 'runtime',
39+
exclude: ['node_modules/@babel/**'],
40+
presets: [
41+
[
42+
'@babel/preset-env',
43+
{
44+
targets: { firefox: '48' },
45+
exclude: ['@babel/plugin-transform-regenerator']
46+
}
47+
]
48+
],
49+
plugins: [
50+
'@babel/plugin-syntax-dynamic-import',
51+
[
52+
'@babel/plugin-transform-runtime',
53+
{
54+
useESModules: true,
55+
regenerator: false
56+
}
10357
]
104-
}),
105-
nodeResolve()
106-
]
107-
}
108-
];
58+
]
59+
})
60+
]
61+
};

‎src/enums/MessageType.ts‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,28 @@
11
export enum MessageType {
2-
RefreshElements = 'refresh-elements',
3-
RefreshDeviceInfo = 'refresh-device-info',
4-
RefreshStorage = 'refresh-storage',
2+
GetDeviceInfo = 'get-device-info',
3+
GetDeviceInfoRes = 'get-device-info-res',
4+
5+
GetElements = 'get-elements',
6+
GetElementsRes = 'get-elements-res',
7+
8+
GetElementStyles = 'get-element-styles',
9+
GetElementStylesRes = 'get-element-styles-res',
10+
SetElementStyles = 'set-element-styles',
11+
SetElementStylesRes = 'set-element-styles-res',
12+
13+
GetElementData = 'get-element-data',
14+
GetElementDataRes = 'get-element-data-res',
15+
SetElementData = 'set-element-data',
16+
SetElementDataRes = 'set-element-data-res',
17+
18+
GetStorage = 'get-storage',
19+
GetStorageRes = 'get-storage-res',
20+
SetStorage = 'set-storage',
21+
SetStorageRes = 'set-storage-res',
22+
23+
// Misc
524

6-
DeviceInfoUpdate = 'device-info-update',
725
NewLog = 'new-log',
826
ClearLogs = 'clear-logs',
9-
ElementsUpdate = 'elements-update',
10-
StorageUpdate = 'storage-update',
11-
1227
Error = 'error'
1328
}

0 commit comments

Comments
 (0)