refactor: update imports and packages based on the latest changes o…

…f `nanolib` (#214)
Alwatr · Oct 11, 2024 · 7be738c · 7be738c
2 parents b7e204a + 4dc21b2
commit 7be738c
Show file tree

Hide file tree

Showing 30 changed files with 313 additions and 215 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -49,6 +49,7 @@
     "Exir",
     "jfsm",
     "Mihandoost",
+    "nanolib",
     "tsbuildinfo"
   ]
 }
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.6.2-sdk",
+  "version": "5.6.3-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs",
   "bin": {

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@alwatr/eslint-config": "^1.2.9",
-    "@alwatr/prettier-config": "^1.0.5",
+    "@alwatr/prettier-config": "^1.0.6",
     "@lerna-lite/changed": "^3.9.3",
     "@lerna-lite/cli": "^3.9.3",
     "@lerna-lite/diff": "^3.9.3",

diff --git a/packages/context/package.json b/packages/context/package.json
@@ -56,14 +56,14 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/logger": "^4.0.3",
+    "@alwatr/nanolib": "^1.2.0",
     "@alwatr/observable": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^2.0.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.1",
-    "@alwatr/type-helper": "^2.0.1",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
+    "@alwatr/type-helper": "^2.0.2",
     "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "typescript": "^5.6.3"

diff --git a/packages/context/src/main.ts b/packages/context/src/main.ts
@@ -1,16 +1,12 @@
-import {definePackage} from '@alwatr/logger';
+import {packageTracer} from '@alwatr/nanolib';
 import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable';
 
-import type {} from '@alwatr/nano-build';
-import type {Dictionary} from '@alwatr/type-helper';
-
-
-definePackage('@alwatr/context', __package_version__);
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
 /**
  * Alwatr Context.
  */
-export class AlwatrContext<T extends Dictionary> extends AlwatrObservable<T> {
+export class AlwatrContext<T extends DictionaryOpt> extends AlwatrObservable<T> {
   constructor(config: AlwatrObservableConfig) {
     config.loggerPrefix ??= 'context-signal';
     super(config);

diff --git a/packages/context/tsconfig.json b/packages/context/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "dist",
     "emitDeclarationOnly": true,
     "composite": true,
+    "types": ["@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"],
   "references": [{"path": "../observable"}],

diff --git a/packages/fetch-state-machine/package.json b/packages/fetch-state-machine/package.json
@@ -57,15 +57,14 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/fetch": "^4.1.3",
     "@alwatr/fsm": "workspace:^",
-    "@alwatr/logger": "^4.0.3"
+    "@alwatr/nanolib": "^1.2.0"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^2.0.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.1",
-    "@alwatr/type-helper": "^2.0.1",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
+    "@alwatr/type-helper": "^2.0.2",
     "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "typescript": "^5.6.3"

diff --git a/packages/fetch-state-machine/src/base.ts b/packages/fetch-state-machine/src/base.ts
@@ -1,10 +1,12 @@
-import {fetch, type FetchOptions} from '@alwatr/fetch';
-import {AlwatrFluxStateMachineBase, type StateRecord, type ActionRecord, type AlwatrFluxStateMachineConfig} from '@alwatr/fsm';
-import {definePackage} from '@alwatr/logger';
-
-import type {} from '@alwatr/nano-build';
-
-definePackage('@alwatr/fetch-state-machine', __package_version__);
+import {
+  AlwatrFluxStateMachineBase,
+  type StateRecord,
+  type ActionRecord,
+  type AlwatrFluxStateMachineConfig
+} from '@alwatr/fsm';
+import {packageTracer, fetch, type FetchOptions} from '@alwatr/nanolib';
+
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
 export type ServerRequestState = 'initial' | 'loading' | 'failed' | 'complete';
 export type ServerRequestEvent = 'request' | 'requestFailed' | 'requestSucceeded';

diff --git a/packages/fetch-state-machine/src/jfsm-base.ts b/packages/fetch-state-machine/src/jfsm-base.ts
@@ -1,7 +1,5 @@
 import {AlwatrFetchStateMachineBase, type FetchOptions} from './base.js';
 
-import type {Json} from '@alwatr/type-helper';
-
 export abstract class AlwatrJsonFetchStateMachineBase<
   T extends Json = Json,
   ExtraState extends string = never,

diff --git a/packages/fetch-state-machine/src/jfsm.ts b/packages/fetch-state-machine/src/jfsm.ts
@@ -1,7 +1,6 @@
 import {AlwatrJsonFetchStateMachineBase} from './jfsm-base.js';
 
 import type {FetchOptions, ServerRequestState} from './base.js';
-import type {Json} from '@alwatr/type-helper';
 
 export class AlwatrJsonFetchStateMachine<T extends Json = Json> extends AlwatrJsonFetchStateMachineBase<T> {
   /**

diff --git a/packages/fetch-state-machine/tsconfig.json b/packages/fetch-state-machine/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "dist",
     "emitDeclarationOnly": true,
     "composite": true,
+    "types": ["@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"],
   "references": [{"path": "../fsm"}]

diff --git a/packages/flux/package.json b/packages/flux/package.json
@@ -64,10 +64,10 @@
     "@alwatr/signal": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^2.0.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.1",
-    "@alwatr/type-helper": "^2.0.1",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
+    "@alwatr/type-helper": "^2.0.2",
     "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "typescript": "^5.6.3"

diff --git a/packages/fsm/package.json b/packages/fsm/package.json
@@ -58,15 +58,14 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/logger": "^4.0.3",
-    "@alwatr/observable": "workspace:^",
-    "@alwatr/polyfill-has-own": "^1.1.3"
+    "@alwatr/nanolib": "^1.2.0",
+    "@alwatr/observable": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^2.0.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.1",
-    "@alwatr/type-helper": "^2.0.1",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
+    "@alwatr/type-helper": "^2.0.2",
     "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "typescript": "^5.6.3"

diff --git a/packages/fsm/src/base.ts b/packages/fsm/src/base.ts
@@ -1,12 +1,9 @@
-import {definePackage} from '@alwatr/logger';
+import {packageTracer} from '@alwatr/nanolib';
 import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable';
-import '@alwatr/polyfill-has-own';
 
 import type {ActionName, ActionRecord, StateEventDetail, StateRecord} from './type.js';
-import type {} from '@alwatr/nano-build';
-import type {MaybePromise} from '@alwatr/type-helper';
 
-definePackage('@alwatr/fsm', __package_version__);
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
 export interface AlwatrFluxStateMachineConfig<S extends string> extends AlwatrObservableConfig {
   initialState: S;

diff --git a/packages/fsm/src/type.ts b/packages/fsm/src/type.ts
@@ -1,5 +1,3 @@
-import type {MaybePromise} from '@alwatr/type-helper';
-
 export interface StateEventDetail<S, E> {
   from: S;
   event: E;

diff --git a/packages/fsm/tsconfig.json b/packages/fsm/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "dist",
     "emitDeclarationOnly": true,
     "composite": true,
+    "types": ["@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"],
   "references": [{"path": "../observable"}],

diff --git a/packages/observable/package.json b/packages/observable/package.json
@@ -56,13 +56,13 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/logger": "^4.0.3"
+    "@alwatr/nanolib": "^1.2.0"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^2.0.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.1",
-    "@alwatr/type-helper": "^2.0.1",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
+    "@alwatr/type-helper": "^2.0.2",
     "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "typescript": "^5.6.3"

diff --git a/packages/observable/src/observable.ts b/packages/observable/src/observable.ts
@@ -1,17 +1,15 @@
-import {createLogger, definePackage} from '@alwatr/logger';
+import {createLogger, packageTracer} from '@alwatr/nanolib';
 
 import type {SubscribeOptions, ListenerCallback, Observer, SubscribeResult, AlwatrObservableInterface} from './type.js';
-import type {} from '@alwatr/nano-build';
-import type {Dictionary} from '@alwatr/type-helper';
 
-definePackage('@alwatr/observable', __package_version__);
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
 export interface AlwatrObservableConfig {
   name: string;
   loggerPrefix?: string;
 }
 
-export abstract class AlwatrObservable<T extends Dictionary = Dictionary> implements AlwatrObservableInterface<T> {
+export abstract class AlwatrObservable<T extends DictionaryOpt = DictionaryOpt> implements AlwatrObservableInterface<T> {
   protected name_;
   protected logger_;
   protected message_?: T;

diff --git a/packages/observable/src/type.ts b/packages/observable/src/type.ts
@@ -1,5 +1,3 @@
-import type {Dictionary, MaybePromise} from '@alwatr/type-helper';
-
 /**
  * Subscribe options type.
  */
@@ -30,9 +28,9 @@ export interface SubscribeOptions {
   // debounce?: 'AnimationFrame' | number;
 }
 
-export type ListenerCallback<T, M extends Dictionary = Dictionary> = (this: T, message: M) => MaybePromise<void>;
+export type ListenerCallback<T, M extends DictionaryOpt = DictionaryOpt> = (this: T, message: M) => MaybePromise<void>;
 
-export interface Observer<T, M extends Dictionary = Dictionary> {
+export interface Observer<T, M extends DictionaryOpt = DictionaryOpt> {
   callback: ListenerCallback<T, M>;
   options: SubscribeOptions;
 }
@@ -41,7 +39,7 @@ export interface SubscribeResult {
   unsubscribe: () => void;
 }
 
-export interface AlwatrObservableInterface<T extends Dictionary = Dictionary> {
+export interface AlwatrObservableInterface<T extends DictionaryOpt = DictionaryOpt> {
   subscribe(listenerCallback: ListenerCallback<this, T>, options?: SubscribeOptions): SubscribeResult;
   unsubscribe(listenerCallback: ListenerCallback<this, T>): void;
 }
diff --git a/packages/observable/tsconfig.json b/packages/observable/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "dist",
     "emitDeclarationOnly": true,
     "composite": true,
+    "types": ["@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"],
   "references": [],

diff --git a/packages/remote-context/package.json b/packages/remote-context/package.json
@@ -60,13 +60,13 @@
   },
   "dependencies": {
     "@alwatr/fetch-state-machine": "workspace:^",
-    "@alwatr/logger": "^4.0.3"
+    "@alwatr/nanolib": "^1.2.0"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^2.0.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.1",
-    "@alwatr/type-helper": "^2.0.1",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
+    "@alwatr/type-helper": "^2.0.2",
     "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "typescript": "^5.6.3"

diff --git a/packages/remote-context/src/base.ts b/packages/remote-context/src/base.ts
@@ -4,8 +4,9 @@ import {
   type ServerRequestEvent,
   type ServerRequestState,
 } from '@alwatr/fetch-state-machine';
+import {packageTracer} from '@alwatr/nanolib';
 
-import type {Json} from '@alwatr/type-helper';
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
 type ExtraState = 'offlineCheck' | 'reloading' | 'reloadingFailed';
 export type ServerContextState = ServerRequestState | ExtraState;

diff --git a/packages/remote-context/src/remote-context.ts b/packages/remote-context/src/remote-context.ts
@@ -1,7 +1,6 @@
 import {AlwatrRemoteContextStateMachineBase, type ServerContextState} from './base.js';
 
-import type {FetchOptions} from '@alwatr/fetch-state-machine';
-import type {Json} from '@alwatr/type-helper';
+import type {FetchOptions} from '@alwatr/nanolib';
 
 export class AlwatrRemoteContextStateMachine<T extends Json = Json> extends AlwatrRemoteContextStateMachineBase<T> {
   /**

diff --git a/packages/remote-context/tsconfig.json b/packages/remote-context/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "dist",
     "emitDeclarationOnly": true,
     "composite": true,
+    "types": ["@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"],
   "references": [{"path": "../fetch-state-machine"}]

diff --git a/packages/signal/package.json b/packages/signal/package.json
@@ -56,14 +56,14 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/logger": "^4.0.3",
+    "@alwatr/nanolib": "^1.2.0",
     "@alwatr/observable": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^2.0.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.1",
-    "@alwatr/type-helper": "^2.0.1",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
+    "@alwatr/type-helper": "^2.0.2",
     "@types/node": "^22.7.5",
     "jest": "^29.7.0",
     "typescript": "^5.6.3"

diff --git a/packages/signal/src/logger.ts b/packages/signal/src/logger.ts
@@ -1,5 +1,3 @@
-import {definePackage} from '@alwatr/logger';
+import {createLogger} from '@alwatr/nanolib';
 
-import type {} from '@alwatr/nano-build';
-
-export const logger = definePackage('@alwatr/signal', __package_version__);
+export const logger = /* #__PURE__ */ createLogger(__package_name__);
diff --git a/packages/signal/src/signal.ts b/packages/signal/src/signal.ts
@@ -2,14 +2,12 @@ import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable'
 
 import {logger} from './logger.js';
 
-import type {Dictionary} from '@alwatr/type-helper';
-
-logger.logModule?.('signal');
+__dev_mode__: logger.logFileModule?.('signal');
 
 /**
  * Alwatr event signal with special message (event detail).
  */
-export class AlwatrSignal<T extends Dictionary = Dictionary> extends AlwatrObservable<T> {
+export class AlwatrSignal<T extends DictionaryOpt = DictionaryOpt> extends AlwatrObservable<T> {
   constructor(config: AlwatrObservableConfig) {
     config.loggerPrefix ??= 'signal';
     super(config);

diff --git a/packages/signal/src/trigger.ts b/packages/signal/src/trigger.ts
@@ -2,7 +2,7 @@ import {AlwatrObservable, type AlwatrObservableConfig} from '@alwatr/observable'
 
 import {logger} from './logger.js';
 
-logger.logModule?.('trigger');
+__dev_mode__: logger.logFileModule?.('trigger');
 
 /**
  * Alwatr event signal without any message (no event detail).

diff --git a/packages/signal/tsconfig.json b/packages/signal/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "dist",
     "emitDeclarationOnly": true,
     "composite": true,
+    "types": ["@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"],
   "references": [{"path": "../observable"}],