@oliasoft-open-source/node-json-migrator 4.5.4 → 4.6.0-beta-1

package/dist/index.cjs

@@ -3,7 +3,6 @@
 var path$1 = require('path');
 var fs = require('fs');
 var esToolkit = require('es-toolkit');
-var moduleFromString = require('module-from-string');
 var crypto = require('crypto');
 var node_url = require('node:url');
 var node_path = require('node:path');
@@ -668,23 +667,10 @@ const capitalize = (word) => {
   return word[0].toUpperCase() + word.slice(1);
 };
 
-const loadModuleFromString = async (script) => {
-  let patchedScript = script;
-  try {
-    await Promise.resolve().then(function () { return require('./immer-ZZLkDBss.cjs'); }).then(({ produce }) => {
-      if (produce) {
-        patchedScript = script.replace(
-          /import\s+produce\s+from\s+['"]immer['"]/,
-          //relaxed detection of extra spaces
-          "import { produce } from 'immer'"
-        );
-      }
-    });
-  } catch {
-  }
-  return (await moduleFromString.importFromString(patchedScript))?.default ?? null;
+const loadModuleFromPath = async (filePath, fileHash, _script) => {
+  return (await import(filePath + "?v=" + fileHash))?.default ?? null;
 };
-const LoaderModule = { loadModuleFromString };
+const LoaderModule = { loadModuleFromPath };
 
 const hash = (string) => crypto.createHash("sha256").update(string).digest("hex");
 
@@ -7615,8 +7601,12 @@ const generatePlanEntries = (sortedMigrationEntries) => sortedMigrationEntries.m
 }));
 const loadMigrationFunctionsFromStrings = async (sortedMigrationEntries, importModule) => Promise.all(
   sortedMigrationEntries.map(async (m) => {
-    const { script } = m;
-    const migrator = script && importModule ? await LoaderModule.loadModuleFromString(script) : null;
+    const { filePath, fileHash, script } = m;
+    const migrator = filePath && fileHash && importModule ? await LoaderModule.loadModuleFromPath(
+      path$1.resolve(filePath),
+      fileHash,
+      script
+    ) : null;
     return {
       fileHash: m.fileHash,
       migrator

package/dist/index.d.cts

@@ -23,6 +23,7 @@ type TMigration = {
     skippedFileHashes?: string[];
     sequenceFromHistory?: string;
     script?: string;
+    filePath?: string;
     migrator?: (payload: TPayload, metaData?: TMetaData) => TPayload;
 };
 type TRecordDetails = {
@@ -144,8 +145,7 @@ declare const migrateAll: ({ config, beforeMigrateRecord, afterMigrateRecord, on
  *  - lodash flow https://lodash.com/docs/4.17.15#flow
  *
  * Implementation includes exception handling to extend errors with the filename
- * until module-with-string fixes its stack trace handling (see OW-8879 and
- * https://github.com/exuanbo/module-from-string/issues/18)
+ * until native dynamic imports fix their stack trace handling (see OW-8879)
  */
 declare const pipe: (migrations: TMigration[], payload: TPayload, metaData?: TMetaData) => TPayload;
 

package/dist/index.d.mts

@@ -23,6 +23,7 @@ type TMigration = {
     skippedFileHashes?: string[];
     sequenceFromHistory?: string;
     script?: string;
+    filePath?: string;
     migrator?: (payload: TPayload, metaData?: TMetaData) => TPayload;
 };
 type TRecordDetails = {
@@ -144,8 +145,7 @@ declare const migrateAll: ({ config, beforeMigrateRecord, afterMigrateRecord, on
  *  - lodash flow https://lodash.com/docs/4.17.15#flow
  *
  * Implementation includes exception handling to extend errors with the filename
- * until module-with-string fixes its stack trace handling (see OW-8879 and
- * https://github.com/exuanbo/module-from-string/issues/18)
+ * until native dynamic imports fix their stack trace handling (see OW-8879)
  */
 declare const pipe: (migrations: TMigration[], payload: TPayload, metaData?: TMetaData) => TPayload;
 

package/dist/index.mjs

@@ -1,7 +1,6 @@
 import path$1 from 'path';
 import { realpathSync as realpathSync$1, readlinkSync, readdirSync, readdir as readdir$1, lstatSync, promises } from 'fs';
 import { isString, xor, merge, omit } from 'es-toolkit';
-import { importFromString } from 'module-from-string';
 import { createHash } from 'crypto';
 import { fileURLToPath } from 'node:url';
 import { win32, posix } from 'node:path';
@@ -647,23 +646,10 @@ const capitalize = (word) => {
   return word[0].toUpperCase() + word.slice(1);
 };
 
-const loadModuleFromString = async (script) => {
-  let patchedScript = script;
-  try {
-    await import('./immer-CjiV9AMA.mjs').then(({ produce }) => {
-      if (produce) {
-        patchedScript = script.replace(
-          /import\s+produce\s+from\s+['"]immer['"]/,
-          //relaxed detection of extra spaces
-          "import { produce } from 'immer'"
-        );
-      }
-    });
-  } catch {
-  }
-  return (await importFromString(patchedScript))?.default ?? null;
+const loadModuleFromPath = async (filePath, fileHash, _script) => {
+  return (await import(filePath + "?v=" + fileHash))?.default ?? null;
 };
-const LoaderModule = { loadModuleFromString };
+const LoaderModule = { loadModuleFromPath };
 
 const hash = (string) => createHash("sha256").update(string).digest("hex");
 
@@ -7594,8 +7580,12 @@ const generatePlanEntries = (sortedMigrationEntries) => sortedMigrationEntries.m
 }));
 const loadMigrationFunctionsFromStrings = async (sortedMigrationEntries, importModule) => Promise.all(
   sortedMigrationEntries.map(async (m) => {
-    const { script } = m;
-    const migrator = script && importModule ? await LoaderModule.loadModuleFromString(script) : null;
+    const { filePath, fileHash, script } = m;
+    const migrator = filePath && fileHash && importModule ? await LoaderModule.loadModuleFromPath(
+      path$1.resolve(filePath),
+      fileHash,
+      script
+    ) : null;
     return {
       fileHash: m.fileHash,
       migrator

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/node-json-migrator",
-  "version": "4.5.4",
+  "version": "4.6.0-beta-1",
   "description": "A library for JSON migrations",
   "homepage": "https://oliasoft-open-source.gitlab.io/node-json-migrator",
   "bugs": {
@@ -39,7 +39,6 @@
     "ajv": "^8.17.1",
     "ajv-errors": "^3.0.0",
     "es-toolkit": "^1.44.0",
-    "module-from-string": "^3.3.1",
     "pg-promise": "^11"
   },
   "devDependencies": {