s3db.js 19.3.21 → 19.3.23

package/dist/tasks/tasks-pool.class.js

@@ -1,8 +1,8 @@
 import { EventEmitter } from 'events';
 import { cpus } from 'os';
 import { setTimeout as delay } from 'timers/promises';
-import { nanoid } from 'nanoid';
 import { AdaptiveTuning } from '../concerns/adaptive-tuning.js';
+import { idGenerator } from '../concerns/id.js';
 import { SignatureStats } from './concerns/signature-stats.js';
 import { FifoTaskQueue } from './concerns/fifo-task-queue.js';
 import { PriorityTaskQueue } from './concerns/priority-task-queue.js';
@@ -361,7 +361,7 @@ export class TasksPool extends EventEmitter {
             ...(options.metadata || {})
         };
         const task = {
-            id: nanoid(),
+            id: idGenerator(),
             fn: fn,
             priority: options.priority || 0,
             retries: options.retries ?? this.retries,
@@ -417,7 +417,7 @@ export class TasksPool extends EventEmitter {
     async addBatch(fns, options = {}) {
         const results = [];
         const errors = [];
-        const batchId = nanoid();
+        const batchId = idGenerator();
         const promises = fns.map((fn, index) => {
             const taskOptions = {
                 priority: options.priority,

package/dist/tasks/tasks-runner.class.js

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
-import { nanoid } from 'nanoid';
 import { AdaptiveTuning } from '../concerns/adaptive-tuning.js';
+import { idGenerator } from '../concerns/id.js';
 import { FifoTaskQueue } from './concerns/fifo-task-queue.js';
 import { PriorityTaskQueue } from './concerns/priority-task-queue.js';
 import { extractLengthHint, deriveSignature } from './concerns/task-signature.js';
@@ -143,7 +143,7 @@ export class TasksRunner extends EventEmitter {
             ...(options.metadata || {})
         };
         const task = {
-            id: nanoid(),
+            id: idGenerator(),
             fn,
             priority: options.priority || 0,
             retries: options.retries ?? this.retries,

package/dist/types/concerns/id.d.ts

@@ -1,5 +1,3 @@
-export declare function initializeNanoid(): Promise<void>;
-export declare function getNanoidInitializationError(): Error | null;
 export declare const idGenerator: (size?: number) => string;
 export declare const passwordGenerator: (size?: number) => string;
 export declare const getUrlAlphabet: () => string;

package/dist/types/core/resource-persistence.class.d.ts

@@ -1,4 +1,5 @@
 import type { StringRecord } from '../types/common.types.js';
+import type { IdGeneratorConfig } from './resource-id-generator.class.js';
 export interface ResourceData extends StringRecord {
     id?: string;
     _contentLength?: number;
@@ -127,6 +128,7 @@ export interface Resource {
     hooks: HooksCollection;
     logger: Logger;
     idGenerator: (data?: unknown) => string | Promise<string>;
+    idGeneratorType?: IdGeneratorConfig;
     versioningEnabled: boolean;
     observers: Observer[];
     executeHooks(hookName: string, data: unknown): Promise<unknown>;

package/dist/types/lite.d.ts

@@ -40,7 +40,7 @@ export * from './errors.js';
 export { createLogger, type LogLevel } from './concerns/logger.js';
 export { tryFn, tryFnSync, type TryResult } from './concerns/try-fn.js';
 export { encrypt, decrypt } from './concerns/crypto.js';
-export { idGenerator, passwordGenerator, createCustomGenerator, initializeNanoid } from './concerns/id.js';
+export { idGenerator, passwordGenerator, createCustomGenerator } from './concerns/id.js';
 export { encode, decode, encodeDecimal, decodeDecimal } from './concerns/base62.js';
 export { encodeBuffer, decodeBuffer, encodeBits, decodeBits } from './concerns/binary.js';
 export { ProcessManager, getProcessManager, resetProcessManager } from './concerns/process-manager.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "19.3.21",
+  "version": "19.3.23",
   "description": "Use AWS S3, the world's most reliable document storage, as a database with this ORM.",
   "main": "dist/s3db.cjs",
   "module": "dist/s3db.es.js",
@@ -92,7 +92,6 @@
     "fastest-validator": "^1.19.1",
     "json-stable-stringify": "^1.3.0",
     "lodash-es": "^4.17.22",
-    "nanoid": "5.1.6",
     "pino": "^10.2.0",
     "pino-pretty": "^13.1.3",
     "recker": "1.0.68"

package/src/concerns/id.ts

@@ -1,14 +1,4 @@
 import { randomFillSync } from 'node:crypto';
-import { createLogger } from './logger.js';
-
-interface Logger {
-  warn(obj: Record<string, unknown>, msg: string): void;
-  info(obj: Record<string, unknown>, msg: string): void;
-  error(obj: Record<string, unknown>, msg: string): void;
-  debug(obj: Record<string, unknown>, msg: string): void;
-}
-
-const logger = createLogger({ name: 'IdGenerator', level: 'info' }) as Logger;
 
 const FALLBACK_URL_ALPHABET =
   'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
@@ -71,38 +61,6 @@ let activeCustomAlphabet: CustomAlphabetFunction = customAlphabetFallback;
 let activeUrlAlphabet: string = FALLBACK_URL_ALPHABET;
 let idGeneratorImpl: (size?: number) => string = activeCustomAlphabet(activeUrlAlphabet, 22);
 let passwordGeneratorImpl: (size?: number) => string = activeCustomAlphabet(PASSWORD_ALPHABET, 16);
-let nanoidInitializationError: Error | null = null;
-
-interface NanoidModule {
-  customAlphabet?: CustomAlphabetFunction;
-  urlAlphabet?: string;
-}
-
-const nanoidReadyPromise: Promise<void> = import('nanoid')
-  .then((mod: NanoidModule) => {
-    const resolvedCustomAlphabet = mod?.customAlphabet ?? activeCustomAlphabet;
-    const resolvedUrlAlphabet = mod?.urlAlphabet ?? activeUrlAlphabet;
-
-    activeCustomAlphabet = resolvedCustomAlphabet;
-    activeUrlAlphabet = resolvedUrlAlphabet;
-    idGeneratorImpl = activeCustomAlphabet(activeUrlAlphabet, 22);
-    passwordGeneratorImpl = activeCustomAlphabet(PASSWORD_ALPHABET, 16);
-  })
-  .catch((error: Error) => {
-    nanoidInitializationError = error;
-    if (typeof process !== 'undefined' && process?.env?.S3DB_DEBUG) {
-      logger.warn({ error: error.message }, 'Failed to dynamically import "nanoid". Using fallback implementation.');
-    }
-  });
-
-export function initializeNanoid(): Promise<void> {
-  return nanoidReadyPromise;
-}
-
-export function getNanoidInitializationError(): Error | null {
-  return nanoidInitializationError;
-}
-
 export const idGenerator = (size?: number): string => idGeneratorImpl(size);
 
 export const passwordGenerator = (size?: number): string => passwordGeneratorImpl(size);

package/src/core/resource-id-generator.class.ts

@@ -155,7 +155,7 @@ export class ResourceIdGenerator {
       return 'incremental';
     }
 
-    return 'nanoid';
+    return 'default';
   }
 
   async getSequenceValue(fieldName: string = 'id'): Promise<number | null> {

package/src/core/resource-persistence.class.ts

@@ -7,6 +7,7 @@ import { calculateTotalSize, calculateEffectiveLimit } from '../concerns/calcula
 import { mapAwsError, InvalidResourceItem, ResourceError, ValidationError } from '../errors.js';
 import { streamToString } from '../stream/index.js';
 import type { StringRecord, JSONValue } from '../types/common.types.js';
+import type { IdGeneratorConfig } from './resource-id-generator.class.js';
 
 export interface ResourceData extends StringRecord {
   id?: string;
@@ -147,6 +148,7 @@ export interface Resource {
   hooks: HooksCollection;
   logger: Logger;
   idGenerator: (data?: unknown) => string | Promise<string>;
+  idGeneratorType?: IdGeneratorConfig;
   versioningEnabled: boolean;
   observers: Observer[];
 
@@ -273,7 +275,9 @@ export class ResourcePersistence {
 
     let finalId = validatedId || preProcessedData.id || id;
     if (!finalId) {
-      finalId = await Promise.resolve(this.idGenerator(preProcessedData));
+      const shouldUseData = this.resource.idGeneratorType === 'custom';
+      const generatedId = shouldUseData ? this.idGenerator(preProcessedData) : this.idGenerator();
+      finalId = await Promise.resolve(generatedId);
       if (!finalId || String(finalId).trim() === '') {
         const { idGenerator } = await import('#src/concerns/id.js');
         finalId = idGenerator();

package/src/lite.ts

@@ -67,7 +67,7 @@ export { tryFn, tryFnSync, type TryResult } from './concerns/try-fn.js';
 export { encrypt, decrypt } from './concerns/crypto.js';
 
 // ID generation
-export { idGenerator, passwordGenerator, createCustomGenerator, initializeNanoid } from './concerns/id.js';
+export { idGenerator, passwordGenerator, createCustomGenerator } from './concerns/id.js';
 
 // Base62 encoding
 export { encode, decode, encodeDecimal, decodeDecimal } from './concerns/base62.js';

package/src/plugins/tfstate/README.md

@@ -28,7 +28,7 @@ Stores metadata about each imported `.tfstate`.
 **Complete Schema:**
 ```javascript
 {
-  id: 'string|required',                    // generated nanoid
+  id: 'string|required',                    // generated ID
   sourceFile: 'string|required',            // 'prod/terraform.tfstate'
   serial: 'number|required',                // State serial
   lineage: 'string',                        // Terraform lineage
@@ -74,7 +74,7 @@ The main resource containing all infrastructure resources extracted from states.
 **Complete Schema:**
 ```javascript
 {
-  id: 'string|required',                    // generated nanoid
+  id: 'string|required',                    // generated ID
   stateFileId: 'string|required',           // FK to states resource
 
   // Denormalized for queries
@@ -179,7 +179,7 @@ Tracks changes between state versions.
 **Complete Schema:**
 ```javascript
 {
-  id: 'string|required',                    // generated nanoid
+  id: 'string|required',                    // generated ID
   sourceFile: 'string|required',            // Which state
   oldSerial: 'number|required',             // Old version
   newSerial: 'number|required',             // New version

package/src/tasks/tasks-pool.class.ts

@@ -1,9 +1,9 @@
 import { EventEmitter } from 'events';
 import { cpus } from 'os';
 import { setTimeout as delay } from 'timers/promises';
-import { nanoid } from 'nanoid';
 import type { TaskExecutor } from '../concurrency/task-executor.interface.js';
 import { AdaptiveTuning } from '../concerns/adaptive-tuning.js';
+import { idGenerator } from '../concerns/id.js';
 import { SignatureStats } from './concerns/signature-stats.js';
 import { FifoTaskQueue } from './concerns/fifo-task-queue.js';
 import { PriorityTaskQueue } from './concerns/priority-task-queue.js';
@@ -625,7 +625,7 @@ export class TasksPool extends EventEmitter implements TaskExecutor {
     };
 
     const task: PoolTask<T> = {
-      id: nanoid(),
+      id: idGenerator(),
       fn: fn as TaskFunction<T>,
       priority: options.priority || 0,
       retries: options.retries ?? this.retries,
@@ -687,7 +687,7 @@ export class TasksPool extends EventEmitter implements TaskExecutor {
   async addBatch<T = unknown>(fns: Array<TaskFunction<T>>, options: BatchOptions = {}): Promise<BatchResult<T>> {
     const results: (T | null)[] = [];
     const errors: Array<{ error: Error; index: number }> = [];
-    const batchId = nanoid();
+    const batchId = idGenerator();
 
     const promises = fns.map((fn, index) => {
       const taskOptions: EnqueueOptions = {

package/src/tasks/tasks-runner.class.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events';
-import { nanoid } from 'nanoid';
 import type { TaskExecutor } from '../concurrency/task-executor.interface.js';
 import { AdaptiveTuning, type AdaptiveTuningOptions } from '../concerns/adaptive-tuning.js';
+import { idGenerator } from '../concerns/id.js';
 import { FifoTaskQueue } from './concerns/fifo-task-queue.js';
 import { PriorityTaskQueue } from './concerns/priority-task-queue.js';
 import { extractLengthHint, deriveSignature } from './concerns/task-signature.js';
@@ -343,7 +343,7 @@ export class TasksRunner extends EventEmitter implements TaskExecutor {
       ...(options.metadata || {})
     };
     const task: RunnerTask<T> = {
-      id: nanoid(),
+      id: idGenerator(),
       fn,
       priority: options.priority || 0,
       retries: options.retries ?? this.retries,