@ghom/orm 1.2.2 → 1.2.5

package/dist/cjs/app/orm.js

@@ -23,10 +23,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ORM = void 0;
+const fs_1 = __importDefault(require("fs"));
 const url_1 = __importDefault(require("url"));
 const handler_1 = require("@ghom/handler");
 const knex_1 = __importDefault(require("knex"));
 const table_js_1 = require("./table.js");
+const pack = JSON.parse(fs_1.default.readFileSync("./package.json", "utf8"));
+const isCJS = pack.type === "commonjs" || pack.type == void 0;
 class ORM extends handler_1.Handler {
     /**
      * @param ormConfig configuration for table handler or just tablePath (path to directory that contains js files of tables)
@@ -47,7 +50,7 @@ class ORM extends handler_1.Handler {
     async init() {
         this.once("finish", async (pathList) => {
             const tables = await Promise.all(pathList.map(async (filepath) => {
-                return Promise.resolve().then(() => __importStar(require(require !== void 0 ? filepath : url_1.default.pathToFileURL(filepath).href))).then((file) => file.default);
+                return Promise.resolve().then(() => __importStar(require(isCJS ? filepath : url_1.default.pathToFileURL(filepath).href))).then((file) => file.default);
             }));
             const migration = new table_js_1.Table({
                 name: "migration",

package/dist/esm/app/orm.js

@@ -1,7 +1,10 @@
+import fs from "fs";
 import url from "url";
 import { Handler } from "@ghom/handler";
 import { default as knex } from "knex";
 import { Table } from "./table.js";
+const pack = JSON.parse(fs.readFileSync("./package.json", "utf8"));
+const isCJS = pack.type === "commonjs" || pack.type == void 0;
 export class ORM extends Handler {
     db;
     ormConfig;
@@ -24,7 +27,7 @@ export class ORM extends Handler {
     async init() {
         this.once("finish", async (pathList) => {
             const tables = await Promise.all(pathList.map(async (filepath) => {
-                return import(require !== void 0 ? filepath : url.pathToFileURL(filepath).href).then((file) => file.default);
+                return import(isCJS ? filepath : url.pathToFileURL(filepath).href).then((file) => file.default);
             }));
             const migration = new Table({
                 name: "migration",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghom/orm",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/app/orm.ts

@@ -1,8 +1,12 @@
+import fs from "fs"
 import url from "url"
 import { Handler } from "@ghom/handler"
 import { Knex, default as knex } from "knex"
 import { MigrationData, Table } from "./table.js"
 
+const pack = JSON.parse(fs.readFileSync("./package.json", "utf8"))
+const isCJS = pack.type === "commonjs" || pack.type == void 0
+
 export interface ORMLogger {
   log: (message: string, section?: string) => void
   error: (text: string | Error, _path: string, full?: boolean) => void
@@ -46,7 +50,7 @@ export class ORM extends Handler {
       const tables: Table<any>[] = await Promise.all(
         pathList.map(async (filepath) => {
           return import(
-            require !== void 0 ? filepath : url.pathToFileURL(filepath).href
+            isCJS ? filepath : url.pathToFileURL(filepath).href
           ).then((file) => file.default)
         })
       )