@nymphjs/nymph 1.0.0-beta.81 → 1.0.0-beta.83

package/src/driver/NymphDriver.ts

@@ -1,21 +1,24 @@
-import fs from 'fs';
-import { difference } from 'lodash';
+import fs from 'node:fs';
+import { difference } from 'lodash-es';
 import ReadLines from 'n-readlines';
-import strtotime from 'locutus/php/datetime/strtotime';
+import strtotime from 'locutus/php/datetime/strtotime.js';
 import { guid } from '@nymphjs/guid';
 
-import type Nymph from '../Nymph';
-import type { Selector, Options, FormattedSelector } from '../Nymph.types';
-import Entity, { type EntityInstanceType } from '../Entity';
+import type Nymph from '../Nymph.js';
+import type { Selector, Options, FormattedSelector } from '../Nymph.types.js';
+import Entity, { type EntityInstanceType } from '../Entity.js';
 import type {
   EntityConstructor,
   EntityData,
   EntityInterface,
   EntityReference,
   SerializedEntityData,
-} from '../Entity.types';
-import { InvalidParametersError, UnableToConnectError } from '../errors';
-import { xor } from '../utils';
+} from '../Entity.types.js';
+import {
+  InvalidParametersError,
+  UnableToConnectError,
+} from '../errors/index.js';
+import { xor } from '../utils.js';
 
 // from: https://stackoverflow.com/a/6969486/664915
 function escapeRegExp(string: string): string {
@@ -910,8 +913,8 @@ export default abstract class NymphDriver {
                   ? 1
                   : 0
                 : options.return === 'guid'
-                ? [guid]
-                : [entity],
+                  ? [guid]
+                  : [entity],
           };
         }
       }
@@ -1035,7 +1038,9 @@ export default abstract class NymphDriver {
       | null = null,
   ) {
     // Get a modified date.
-    const mdate = Date.now();
+    const mdate = this.nymph.config.updateMDate
+      ? Date.now()
+      : (entity.mdate ?? Date.now());
     const tags = difference(entity.tags, ['']);
     const data = entity.$getData();
     const sdata = entity.$getSData();

package/src/driver/index.ts

@@ -1,4 +1,4 @@
-import NymphDriver from './NymphDriver';
+import NymphDriver from './NymphDriver.js';
 export { NymphDriver };
 
-export * from './testArtifacts';
+export * from './testArtifacts.js';

package/src/driver/testArtifacts.ts

@@ -1,15 +1,19 @@
-import fs from 'fs';
-import strtotime from 'locutus/php/datetime/strtotime';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import fs from 'node:fs';
+import strtotime from 'locutus/php/datetime/strtotime.js';
 import { guid } from '@nymphjs/guid';
 
-import type Nymph from '../Nymph';
-import { EntityUniqueConstraintError } from '../errors';
+import type Nymph from '../Nymph.js';
+import { EntityUniqueConstraintError } from '../errors/index.js';
 import {
   TestBModel as TestBModelClass,
   TestModel as TestModelClass,
   TestModelData,
   TestEmptyModel as TestEmptyModelClass,
-} from '../testArtifacts';
+} from '../testArtifacts.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 export function EntitiesTest(
   nymph: Nymph,

package/src/errors/index.ts

@@ -1,19 +1,19 @@
-export * from './ClassNotAvailableError';
+export * from './ClassNotAvailableError.js';
 
-export * from './EntityConflictError';
+export * from './EntityConflictError.js';
 
-export * from './EntityInvalidDataError';
+export * from './EntityInvalidDataError.js';
 
-export * from './EntityIsSleepingReferenceError';
+export * from './EntityIsSleepingReferenceError.js';
 
-export * from './EntityUniqueConstraintError';
+export * from './EntityUniqueConstraintError.js';
 
-export * from './InvalidParametersError';
+export * from './InvalidParametersError.js';
 
-export * from './InvalidStateError';
+export * from './InvalidStateError.js';
 
-export * from './NotConfiguredError';
+export * from './NotConfiguredError.js';
 
-export * from './QueryFailedError';
+export * from './QueryFailedError.js';
 
-export * from './UnableToConnectError';
+export * from './UnableToConnectError.js';

package/src/index.ts

@@ -1,20 +1,20 @@
-export * from './conf';
-export * from './driver';
-export * from './errors';
+export * from './conf/index.js';
+export * from './driver/index.js';
+export * from './errors/index.js';
 
-export * from './Entity.types';
+export * from './Entity.types.js';
 
-export * from './Entity';
-import Entity from './Entity';
+export * from './Entity.js';
+import Entity from './Entity.js';
 export { Entity };
 
-export * from './Nymph.types';
+export * from './Nymph.types.js';
 
-export * from './Nymph';
-import Nymph from './Nymph';
+export * from './Nymph.js';
+import Nymph from './Nymph.js';
 export { Nymph };
 
-import nymphJoiProps from './nymphJoiProps';
+import nymphJoiProps from './nymphJoiProps.js';
 export { nymphJoiProps };
 
-export * from './utils';
+export * from './utils.js';

package/src/testArtifacts.ts

@@ -1,4 +1,4 @@
-import Entity from './Entity';
+import Entity from './Entity.js';
 
 export type TestModelData = {
   name?: string;

package/src/testMocks.ts

@@ -1,15 +1,15 @@
 import { guid } from '@nymphjs/guid';
 
-import type Nymph from './Nymph';
-import type { EntityInstanceType } from './Entity';
+import type Nymph from './Nymph.js';
+import type { EntityInstanceType } from './Entity.js';
 import type {
   EntityConstructor,
   EntityInterface,
   EntityJson,
-} from './Entity.types';
-import { Options, Selector } from './Nymph.types';
-import { ClassNotAvailableError } from './errors';
-import Entity from './Entity';
+} from './Entity.types.js';
+import { Options, Selector } from './Nymph.types.js';
+import { ClassNotAvailableError } from './errors/index.js';
+import Entity from './Entity.js';
 
 const entities: { [k: string]: EntityJson } = {};
 

package/src/type/locutus.d.ts

@@ -0,0 +1,3 @@
+declare module 'locutus/php/datetime/strtotime.js' {
+  export default function (str: string, now?: number): number;
+}

package/src/utils.ts

@@ -1,7 +1,7 @@
-import Entity from './Entity';
-import { EntityReference } from './Entity.types';
-import Nymph from './Nymph';
-import { Options, Selector } from './Nymph.types';
+import Entity from './Entity.js';
+import { EntityReference } from './Entity.types.js';
+import Nymph from './Nymph.js';
+import { Options, Selector } from './Nymph.types.js';
 
 export function xor(a: any, b: any): boolean {
   return !!(a && !b) || (!a && b);

package/tsconfig.json

@@ -2,7 +2,9 @@
   "extends": "@tsconfig/recommended/tsconfig.json",
 
   "compilerOptions": {
-    "lib": ["ES2023"],
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "lib": ["ES2022"],
     "target": "ES2022",
     "noImplicitAny": true,
     "removeComments": false,