refactor: update imports & packages based on the latest changes of …

…`nanolib` (#310)
Alwatr · Oct 11, 2024 · ff53812 · ff53812
2 parents 22fceda + 0d66f89
commit ff53812
Show file tree

Hide file tree

Showing 19 changed files with 298 additions and 203 deletions.
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
@@ -37,8 +37,8 @@
     "publish": "lerna publish from-package"
   },
   "devDependencies": {
-    "@alwatr/eslint-config": "^1.2.8",
-    "@alwatr/prettier-config": "^1.0.5",
+    "@alwatr/eslint-config": "^1.2.11",
+    "@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/engine/package.json b/packages/engine/package.json
@@ -60,20 +60,16 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/exit-hook": "^1.1.1",
-    "@alwatr/flat-string": "^1.1.1",
-    "@alwatr/logger": "^4.0.1",
+    "@alwatr/nanolib": "^1.2.0",
     "@alwatr/nitrobase-helper": "workspace:^",
     "@alwatr/nitrobase-reference": "workspace:^",
-    "@alwatr/nitrobase-types": "workspace:^",
-    "@alwatr/node-fs": "^1.1.1",
-    "@alwatr/wait": "^1.1.16"
+    "@alwatr/nitrobase-types": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^1.5.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.0",
-    "@alwatr/type-helper": "^2.0.0",
+    "@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",
     "typescript": "^5.6.3"
   }

diff --git a/packages/engine/src/alwatr-nitrobase.ts b/packages/engine/src/alwatr-nitrobase.ts
@@ -1,4 +1,6 @@
-import {exitHook} from '@alwatr/exit-hook';
+import {delay} from '@alwatr/nanolib';
+import {exitHook} from '@alwatr/nanolib/exit-hook';
+import {existsSync, readJson, resolve, unlink, writeJson} from '@alwatr/nanolib/node-fs';
 import {getStoreId, getStorePath} from '@alwatr/nitrobase-helper';
 import {CollectionReference, DocumentReference} from '@alwatr/nitrobase-reference';
 import {
@@ -12,14 +14,10 @@ import {
   type StoreFileId,
   type CollectionItem,
 } from '@alwatr/nitrobase-types';
-import {existsSync, readJson, resolve, unlink, writeJson} from '@alwatr/node-fs';
-import {waitForTimeout} from '@alwatr/wait';
 
 import {logger} from './logger.js';
 
-import type {Dictionary, JsonObject} from '@alwatr/type-helper';
-
-logger.logModule?.('alwatr-nitrobase');
+__dev_mode__: logger.logFileModule?.('alwatr-nitrobase');
 
 /**
  * AlwatrNitrobase configuration.
@@ -79,7 +77,7 @@ export class AlwatrNitrobase {
   /**
    * Keep all loaded nitrobase file context loaded in memory.
    */
-  private cacheReferences__: Dictionary<DocumentReference | CollectionReference> = {};
+  private cacheReferences__: DictionaryReq<DocumentReference | CollectionReference> = {};
 
   /**
    * Constructs an AlwatrNitrobase instance with the provided configuration.
@@ -377,7 +375,7 @@ export class AlwatrNitrobase {
     }
     const path = getStorePath(this.rootDb__.getItemData(id_));
     this.rootDb__.removeItem(id_);
-    await waitForTimeout(0);
+    await delay.by(0);
     try {
       await unlink(resolve(this.config__.rootPath, path));
     }

diff --git a/packages/engine/src/logger.ts b/packages/engine/src/logger.ts
@@ -1,5 +1,5 @@
-import {definePackage} from '@alwatr/logger';
+import {createLogger, packageTracer} from '@alwatr/nanolib';
 
-import type {} from '@alwatr/nano-build';
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
-export const logger = definePackage('@alwatr/nitrobase-engine', __package_version__);
+export const logger = /* #__PURE__ */ createLogger(__package_name__);
diff --git a/packages/engine/tsconfig.json b/packages/engine/tsconfig.json
@@ -4,7 +4,8 @@
     "rootDir": "src",
     "outDir": "dist",
     "emitDeclarationOnly": true,
-    "composite": true
+    "composite": true,
+    "types": ["node", "@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"],
   "references": [{"path": "../types"}, {"path": "../reference"}, {"path": "../helper"}]

diff --git a/packages/helper/package.json b/packages/helper/package.json
@@ -60,14 +60,14 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/flat-string": "^1.1.1",
+    "@alwatr/nanolib": "^1.2.0",
     "@alwatr/nitrobase-types": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/logger": "^4.0.1",
-    "@alwatr/nano-build": "^1.5.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.0",
+    "@alwatr/logger": "^4.0.5",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
     "@alwatr/wait": "^1.1.16",
     "@types/node": "^22.7.5",
     "typescript": "^5.6.3"

diff --git a/packages/helper/src/main.ts b/packages/helper/src/main.ts
@@ -1,6 +1,8 @@
-import {flatString} from '@alwatr/flat-string';
+import {flatString, packageTracer} from '@alwatr/nanolib';
 import {StoreFileExtension, type StoreFileId, type StoreFileStat} from '@alwatr/nitrobase-types';
 
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
+
 /**
  * Convert StoreFileId to a string ID.
  *

diff --git a/packages/nitrobase/package.json b/packages/nitrobase/package.json
@@ -60,16 +60,17 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
+    "@alwatr/nanolib": "^1.2.0",
     "@alwatr/nitrobase-engine": "workspace:^",
     "@alwatr/nitrobase-helper": "workspace:^",
     "@alwatr/nitrobase-reference": "workspace:^",
     "@alwatr/nitrobase-types": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/logger": "^4.0.1",
-    "@alwatr/nano-build": "^1.5.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.0",
+    "@alwatr/logger": "^4.0.5",
+    "@alwatr/nano-build": "^2.0.1",
+    "@alwatr/prettier-config": "^1.0.6",
+    "@alwatr/tsconfig-base": "^1.3.2",
     "@alwatr/wait": "^1.1.16",
     "@types/node": "^22.7.5",
     "typescript": "^5.6.3"

diff --git a/packages/nitrobase/src/main.ts b/packages/nitrobase/src/main.ts
@@ -1,4 +1,8 @@
+import {packageTracer} from '@alwatr/nanolib';
+
 export * from '@alwatr/nitrobase-engine';
 export * from '@alwatr/nitrobase-reference';
 export * from '@alwatr/nitrobase-helper';
 export * from '@alwatr/nitrobase-types';
+
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
diff --git a/packages/reference/package.json b/packages/reference/package.json
@@ -60,17 +60,15 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/flat-string": "^1.1.1",
-    "@alwatr/logger": "^4.0.1",
+    "@alwatr/nanolib": "^1.2.0",
     "@alwatr/nitrobase-helper": "workspace:^",
-    "@alwatr/nitrobase-types": "workspace:^",
-    "@alwatr/wait": "^1.1.16"
+    "@alwatr/nitrobase-types": "workspace:^"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^1.5.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.0",
-    "@alwatr/type-helper": "^2.0.0",
+    "@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",
     "typescript": "^5.6.3"
   }

diff --git a/packages/reference/src/collection-reference.ts b/packages/reference/src/collection-reference.ts
@@ -1,4 +1,4 @@
-import {createLogger} from '@alwatr/logger';
+import {createLogger, delay} from '@alwatr/nanolib';
 import {getStoreId, getStorePath} from '@alwatr/nitrobase-helper';
 import {
   StoreFileType,
@@ -9,13 +9,10 @@ import {
   type CollectionItemMeta,
   type StoreFileMeta,
 } from '@alwatr/nitrobase-types';
-import {waitForImmediate, waitForTimeout} from '@alwatr/wait';
 
 import {logger} from './logger.js';
 
-import type {Dictionary, JsonObject} from '@alwatr/type-helper';
-
-logger.logModule?.('collection-reference');
+__dev_mode__: logger.logFileModule?.('collection-reference');
 
 /**
  * Represents a reference to a collection of the AlwatrNitrobase.
@@ -142,7 +139,7 @@ export class CollectionReference<TItem extends JsonObject = JsonObject> {
       if (this.context__.meta.schemaVer === undefined || this.context__.meta.schemaVer === 0) {
         this.context__.meta.schemaVer = 1;
       }
-      delete (this.context__.meta as Dictionary)['ver'];
+      delete (this.context__.meta as DictionaryOpt)['ver'];
       this.context__.meta.extra ??= {};
       this.context__.meta.fv = 3;
     }
@@ -588,10 +585,10 @@ export class CollectionReference<TItem extends JsonObject = JsonObject> {
     this.updateDelayed_ = true;
 
     if (immediate === true || this.context__.meta.changeDebounce === undefined) {
-      await waitForImmediate();
+      await delay.immediate();
     }
     else {
-      await waitForTimeout(this.context__.meta.changeDebounce);
+      await delay.by(this.context__.meta.changeDebounce);
     }
 
     if (this.updateDelayed_ !== true) return; // another parallel update finished!

diff --git a/packages/reference/src/document-reference.ts b/packages/reference/src/document-reference.ts
@@ -1,13 +1,10 @@
-import {createLogger} from '@alwatr/logger';
+import {createLogger, delay} from '@alwatr/nanolib';
 import {getStoreId, getStorePath} from '@alwatr/nitrobase-helper';
 import {StoreFileType, StoreFileExtension, type StoreFileId, type DocumentContext, type StoreFileMeta} from '@alwatr/nitrobase-types';
-import {waitForImmediate, waitForTimeout} from '@alwatr/wait';
 
 import {logger} from './logger.js';
 
-import type {Dictionary, JsonObject} from '@alwatr/type-helper';
-
-logger.logModule?.('document-reference');
+__dev_mode__: logger.logFileModule?.('document-reference');
 
 /**
  * Represents a reference to a document of the AlwatrNitrobase.
@@ -131,7 +128,7 @@ export class DocumentReference<TDoc extends JsonObject = JsonObject> {
       if (this.context__.meta.schemaVer === undefined || this.context__.meta.schemaVer === 0) {
         this.context__.meta.schemaVer = 1;
       }
-      delete (this.context__.meta as Dictionary)['ver'];
+      delete (this.context__.meta as DictionaryOpt)['ver'];
       this.context__.meta.extra ??= {};
       this.context__.meta.fv = 3;
     }
@@ -358,10 +355,10 @@ export class DocumentReference<TDoc extends JsonObject = JsonObject> {
     this.updateDelayed_ = true;
 
     if (immediate === true || this.context__.meta.changeDebounce === undefined) {
-      await waitForImmediate();
+      await delay.immediate();
     }
     else {
-      await waitForTimeout(this.context__.meta.changeDebounce);
+      await delay.by(this.context__.meta.changeDebounce);
     }
 
     if (this.updateDelayed_ !== true) return; // another parallel update finished!

diff --git a/packages/reference/src/logger.ts b/packages/reference/src/logger.ts
@@ -1,5 +1,5 @@
-import {definePackage} from '@alwatr/logger';
+import {createLogger, packageTracer} from '@alwatr/nanolib';
 
-import type {} from '@alwatr/nano-build';
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
-export const logger = definePackage('@alwatr/nitrobase-reference', __package_version__);
+export const logger = /* #__PURE__ */ createLogger(__package_name__);
diff --git a/packages/reference/tsconfig.json b/packages/reference/tsconfig.json
@@ -4,7 +4,8 @@
     "rootDir": "src",
     "outDir": "dist",
     "emitDeclarationOnly": true,
-    "composite": true
+    "composite": true,
+    "types": ["node", "@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts", "src/util.ts"],
   "references": [{"path": "../types"}, {"path": "../helper"}]

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -60,13 +60,13 @@
     "clean": "rm -rfv dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@alwatr/dedupe": "^1.1.1"
+    "@alwatr/nanolib": "^1.2.0"
   },
   "devDependencies": {
-    "@alwatr/nano-build": "^1.5.0",
-    "@alwatr/prettier-config": "^1.0.5",
-    "@alwatr/tsconfig-base": "^1.3.0",
-    "@alwatr/type-helper": "^2.0.0",
+    "@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",
     "typescript": "^5.6.3"
   }

diff --git a/packages/types/src/main.ts b/packages/types/src/main.ts
@@ -1,9 +1,6 @@
-import {definePackage} from '@alwatr/dedupe';
+import {packageTracer} from '@alwatr/nanolib';
 
-import type {} from '@alwatr/nano-build';
-import type {Dictionary, JsonObject} from '@alwatr/type-helper';
-
-definePackage('@alwatr/nitrobase-types', __package_version__);
+__dev_mode__: packageTracer.add(__package_name__, __package_version__);
 
 // *** Nitrobase File ***
 
@@ -265,4 +262,4 @@ export type CollectionItem<TData extends JsonObject = JsonObject> = {
 /**
  * Collection item context type.
  */
-export type CollectionContext<T extends JsonObject = JsonObject> = StoreFileContext<Dictionary<CollectionItem<T>>>;
+export type CollectionContext<T extends JsonObject = JsonObject> = StoreFileContext<DictionaryReq<CollectionItem<T>>>;
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
@@ -4,7 +4,8 @@
     "rootDir": "src",
     "outDir": "dist",
     "emitDeclarationOnly": true,
-    "composite": true
+    "composite": true,
+    "types": ["node", "@alwatr/nano-build", "@alwatr/type-helper"]
   },
   "include": ["src/**/*.ts"]
 }