Skip to content

Commit b905288

Browse files
refactor: update imports & packages based on the latest changes of nanolib
1 parent be2b945 commit b905288

26 files changed

+40
-56
lines changed

.vscode/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"Exir",
5050
"jfsm",
5151
"Mihandoost",
52+
"nanolib",
5253
"tsbuildinfo"
5354
]
5455
}

packages/context/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"clean": "rm -rfv dist *.tsbuildinfo"
5757
},
5858
"dependencies": {
59-
"@alwatr/logger": "^4.0.3",
59+
"@alwatr/nanolib": "^1.0.2",
6060
"@alwatr/observable": "workspace:^"
6161
},
6262
"devDependencies": {

packages/context/src/main.ts

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
import {definePackage} from '@alwatr/logger';
1+
import {packageTracer} from '@alwatr/nanolib';
22
import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable';
33

4-
import type {} from '@alwatr/nano-build';
5-
import type {Dictionary} from '@alwatr/type-helper';
6-
7-
8-
definePackage('@alwatr/context', __package_version__);
4+
packageTracer.add(__package_name__, __package_version__);
95

106
/**
117
* Alwatr Context.
128
*/
13-
export class AlwatrContext<T extends Dictionary> extends AlwatrObservable<T> {
9+
export class AlwatrContext<T extends DictionaryOpt> extends AlwatrObservable<T> {
1410
constructor(config: AlwatrObservableConfig) {
1511
config.loggerPrefix ??= 'context-signal';
1612
super(config);

packages/context/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"outDir": "dist",
66
"emitDeclarationOnly": true,
77
"composite": true,
8+
"types": ["@alwatr/nano-build", "@alwatr/type-helper"]
89
},
910
"include": ["src/**/*.ts"],
1011
"references": [{"path": "../observable"}],

packages/fetch-state-machine/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@
5757
"clean": "rm -rfv dist *.tsbuildinfo"
5858
},
5959
"dependencies": {
60-
"@alwatr/fetch": "^4.1.3",
6160
"@alwatr/fsm": "workspace:^",
62-
"@alwatr/logger": "^4.0.3"
61+
"@alwatr/nanolib": "^1.0.2"
6362
},
6463
"devDependencies": {
6564
"@alwatr/nano-build": "^2.0.0",

packages/fetch-state-machine/src/base.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import {fetch, type FetchOptions} from '@alwatr/fetch';
2-
import {AlwatrFluxStateMachineBase, type StateRecord, type ActionRecord, type AlwatrFluxStateMachineConfig} from '@alwatr/fsm';
3-
import {definePackage} from '@alwatr/logger';
4-
5-
import type {} from '@alwatr/nano-build';
6-
7-
definePackage('@alwatr/fetch-state-machine', __package_version__);
1+
import {
2+
AlwatrFluxStateMachineBase,
3+
type StateRecord,
4+
type ActionRecord,
5+
type AlwatrFluxStateMachineConfig
6+
} from '@alwatr/fsm';
7+
import {packageTracer, fetch, type FetchOptions} from '@alwatr/nanolib';
8+
9+
packageTracer.add(__package_name__, __package_version__);
810

911
export type ServerRequestState = 'initial' | 'loading' | 'failed' | 'complete';
1012
export type ServerRequestEvent = 'request' | 'requestFailed' | 'requestSucceeded';

packages/fetch-state-machine/src/jfsm-base.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import {AlwatrFetchStateMachineBase, type FetchOptions} from './base.js';
22

3-
import type {Json} from '@alwatr/type-helper';
4-
53
export abstract class AlwatrJsonFetchStateMachineBase<
64
T extends Json = Json,
75
ExtraState extends string = never,

packages/fetch-state-machine/src/jfsm.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {AlwatrJsonFetchStateMachineBase} from './jfsm-base.js';
22

33
import type {FetchOptions, ServerRequestState} from './base.js';
4-
import type {Json} from '@alwatr/type-helper';
54

65
export class AlwatrJsonFetchStateMachine<T extends Json = Json> extends AlwatrJsonFetchStateMachineBase<T> {
76
/**

packages/fetch-state-machine/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"outDir": "dist",
66
"emitDeclarationOnly": true,
77
"composite": true,
8+
"types": ["@alwatr/nano-build", "@alwatr/type-helper"]
89
},
910
"include": ["src/**/*.ts"],
1011
"references": [{"path": "../fsm"}]

packages/fsm/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@
5858
"clean": "rm -rfv dist *.tsbuildinfo"
5959
},
6060
"dependencies": {
61-
"@alwatr/logger": "^4.0.3",
62-
"@alwatr/observable": "workspace:^",
63-
"@alwatr/polyfill-has-own": "^1.1.3"
61+
"@alwatr/nanolib": "^1.0.2",
62+
"@alwatr/observable": "workspace:^"
6463
},
6564
"devDependencies": {
6665
"@alwatr/nano-build": "^2.0.0",

packages/fsm/src/base.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
import {definePackage} from '@alwatr/logger';
1+
import {packageTracer} from '@alwatr/nanolib';
22
import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable';
3-
import '@alwatr/polyfill-has-own';
43

54
import type {ActionName, ActionRecord, StateEventDetail, StateRecord} from './type.js';
6-
import type {} from '@alwatr/nano-build';
7-
import type {MaybePromise} from '@alwatr/type-helper';
85

9-
definePackage('@alwatr/fsm', __package_version__);
6+
packageTracer.add(__package_name__, __package_version__);
107

118
export interface AlwatrFluxStateMachineConfig<S extends string> extends AlwatrObservableConfig {
129
initialState: S;

packages/fsm/src/type.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import type {MaybePromise} from '@alwatr/type-helper';
2-
31
export interface StateEventDetail<S, E> {
42
from: S;
53
event: E;

packages/fsm/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"outDir": "dist",
66
"emitDeclarationOnly": true,
77
"composite": true,
8+
"types": ["@alwatr/nano-build", "@alwatr/type-helper"]
89
},
910
"include": ["src/**/*.ts"],
1011
"references": [{"path": "../observable"}],

packages/observable/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"clean": "rm -rfv dist *.tsbuildinfo"
5757
},
5858
"dependencies": {
59-
"@alwatr/logger": "^4.0.3"
59+
"@alwatr/nanolib": "^1.0.2"
6060
},
6161
"devDependencies": {
6262
"@alwatr/nano-build": "^2.0.0",

packages/observable/src/observable.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
import {createLogger, definePackage} from '@alwatr/logger';
1+
import {createLogger, packageTracer} from '@alwatr/nanolib';
22

33
import type {SubscribeOptions, ListenerCallback, Observer, SubscribeResult, AlwatrObservableInterface} from './type.js';
4-
import type {} from '@alwatr/nano-build';
5-
import type {Dictionary} from '@alwatr/type-helper';
64

7-
definePackage('@alwatr/observable', __package_version__);
5+
packageTracer.add(__package_name__, __package_version__);
86

97
export interface AlwatrObservableConfig {
108
name: string;
119
loggerPrefix?: string;
1210
}
1311

14-
export abstract class AlwatrObservable<T extends Dictionary = Dictionary> implements AlwatrObservableInterface<T> {
12+
export abstract class AlwatrObservable<T extends DictionaryOpt = DictionaryOpt> implements AlwatrObservableInterface<T> {
1513
protected name_;
1614
protected logger_;
1715
protected message_?: T;

packages/observable/src/type.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import type {Dictionary, MaybePromise} from '@alwatr/type-helper';
2-
31
/**
42
* Subscribe options type.
53
*/
@@ -30,9 +28,9 @@ export interface SubscribeOptions {
3028
// debounce?: 'AnimationFrame' | number;
3129
}
3230

33-
export type ListenerCallback<T, M extends Dictionary = Dictionary> = (this: T, message: M) => MaybePromise<void>;
31+
export type ListenerCallback<T, M extends DictionaryOpt = DictionaryOpt> = (this: T, message: M) => MaybePromise<void>;
3432

35-
export interface Observer<T, M extends Dictionary = Dictionary> {
33+
export interface Observer<T, M extends DictionaryOpt = DictionaryOpt> {
3634
callback: ListenerCallback<T, M>;
3735
options: SubscribeOptions;
3836
}
@@ -41,7 +39,7 @@ export interface SubscribeResult {
4139
unsubscribe: () => void;
4240
}
4341

44-
export interface AlwatrObservableInterface<T extends Dictionary = Dictionary> {
42+
export interface AlwatrObservableInterface<T extends DictionaryOpt = DictionaryOpt> {
4543
subscribe(listenerCallback: ListenerCallback<this, T>, options?: SubscribeOptions): SubscribeResult;
4644
unsubscribe(listenerCallback: ListenerCallback<this, T>): void;
4745
}

packages/observable/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"outDir": "dist",
66
"emitDeclarationOnly": true,
77
"composite": true,
8+
"types": ["@alwatr/nano-build", "@alwatr/type-helper"]
89
},
910
"include": ["src/**/*.ts"],
1011
"references": [],

packages/remote-context/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
"dependencies": {
6262
"@alwatr/fetch-state-machine": "workspace:^",
63-
"@alwatr/logger": "^4.0.3"
63+
"@alwatr/nanolib": "^1.0.2"
6464
},
6565
"devDependencies": {
6666
"@alwatr/nano-build": "^2.0.0",

packages/remote-context/src/base.ts

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import {
55
type ServerRequestState,
66
} from '@alwatr/fetch-state-machine';
77

8-
import type {Json} from '@alwatr/type-helper';
9-
108
type ExtraState = 'offlineCheck' | 'reloading' | 'reloadingFailed';
119
export type ServerContextState = ServerRequestState | ExtraState;
1210

packages/remote-context/src/remote-context.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {AlwatrRemoteContextStateMachineBase, type ServerContextState} from './base.js';
22

3-
import type {FetchOptions} from '@alwatr/fetch-state-machine';
4-
import type {Json} from '@alwatr/type-helper';
3+
import type {FetchOptions} from '@alwatr/nanolib';
54

65
export class AlwatrRemoteContextStateMachine<T extends Json = Json> extends AlwatrRemoteContextStateMachineBase<T> {
76
/**

packages/remote-context/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"outDir": "dist",
66
"emitDeclarationOnly": true,
77
"composite": true,
8+
"types": ["@alwatr/nano-build", "@alwatr/type-helper"]
89
},
910
"include": ["src/**/*.ts"],
1011
"references": [{"path": "../fetch-state-machine"}]

packages/signal/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"clean": "rm -rfv dist *.tsbuildinfo"
5757
},
5858
"dependencies": {
59-
"@alwatr/logger": "^4.0.3",
59+
"@alwatr/nanolib": "^1.0.2",
6060
"@alwatr/observable": "workspace:^"
6161
},
6262
"devDependencies": {

packages/signal/src/logger.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import {definePackage} from '@alwatr/logger';
1+
import {createLogger} from '@alwatr/nanolib';
22

3-
import type {} from '@alwatr/nano-build';
4-
5-
export const logger = definePackage('@alwatr/signal', __package_version__);
3+
export const logger = createLogger(__package_name__);

packages/signal/src/signal.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable'
22

33
import {logger} from './logger.js';
44

5-
import type {Dictionary} from '@alwatr/type-helper';
6-
7-
logger.logModule?.('signal');
5+
logger.logFileModule?.('signal');
86

97
/**
108
* Alwatr event signal with special message (event detail).
119
*/
12-
export class AlwatrSignal<T extends Dictionary = Dictionary> extends AlwatrObservable<T> {
10+
export class AlwatrSignal<T extends DictionaryOpt = DictionaryOpt> extends AlwatrObservable<T> {
1311
constructor(config: AlwatrObservableConfig) {
1412
config.loggerPrefix ??= 'signal';
1513
super(config);

packages/signal/src/trigger.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable'
22

33
import {logger} from './logger.js';
44

5-
logger.logModule?.('trigger');
5+
logger.logFileModule?.('trigger');
66

77
/**
88
* Alwatr event signal without any message (no event detail).

packages/signal/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"outDir": "dist",
66
"emitDeclarationOnly": true,
77
"composite": true,
8+
"types": ["@alwatr/nano-build", "@alwatr/type-helper"]
89
},
910
"include": ["src/**/*.ts"],
1011
"references": [{"path": "../observable"}],

0 commit comments

Comments
 (0)