@ghom/orm 1.3.1 → 1.3.3

package/dist/typings/index.d.ts

@@ -1,10 +1,2 @@
 export * from "./app/orm.js";
 export * from "./app/table.js";
-declare module "@ghom/orm/esm" {
-    export * from "./app/orm.js";
-    export * from "./app/table.js";
-}
-declare module "@ghom/orm/cjs" {
-    export * from "./app/orm.js";
-    export * from "./app/table.js";
-}

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@ghom/orm",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "license": "MIT",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "type": "module",
+  "main": "dist/esm/index.js",
   "types": "dist/typings/index.d.ts",
   "description": "TypeScript KnexJS ORM & handler",
   "prettier": {
     "semi": false
   },
   "exports": {
-    "./esm": "./dist/esm/index.js",
-    "./cjs": "./dist/cjs/index.js"
+    "import": "./dist/esm/index.js",
+    "require": "./dist/cjs/index.js"
   },
   "scripts": {
     "format": "prettier --write src tsconfig.*",
     "build": "rm -fr dist/* && tsc -p tsconfig-esm.json && tsc -p tsconfig-cjs.json && fixup.sh",
-    "test": "npm run build && jest tests/test.js --detectOpenHandles",
+    "test": "npm run build && node --experimental-vm-modules node_modules/jest/bin/jest.js tests/test.js --detectOpenHandles",
     "prepublishOnly": "npm run format && npm test"
   },
   "devDependencies": {

package/src/index.ts

@@ -1,14 +1,2 @@
 export * from "./app/orm.js"
 export * from "./app/table.js"
-
-// @ts-ignore
-declare module "@ghom/orm/esm" {
-  export * from "./app/orm.js"
-  export * from "./app/table.js"
-}
-
-// @ts-ignore
-declare module "@ghom/orm/cjs" {
-  export * from "./app/orm.js"
-  export * from "./app/table.js"
-}

package/tests/tables/a.js

@@ -1,6 +1,6 @@
-const { Table } = require("../..")
+import { Table } from "../.."
 
-module.exports = new Table({
+export default new Table({
   name: "a",
   priority: 0,
   setup(table) {

package/tests/tables/b.js

@@ -1,6 +1,6 @@
-const { Table } = require("../..")
+import { Table } from "../.."
 
-module.exports = new Table({
+export default new Table({
   name: "b",
   migrations: {
     0: (table) =>
@@ -9,7 +9,7 @@ module.exports = new Table({
         .references("id")
         .inTable("c")
         .onDelete("cascade")
-        .notNullable(),
+        .notNullable()
   },
   priority: 1,
   setup(table) {

package/tests/tables/c.js

@@ -1,6 +1,6 @@
-const { Table } = require("../..")
+import { Table } from "../.."
 
-module.exports = new Table({
+export default new Table({
   name: "c",
   priority: 2,
   setup(table) {

package/tests/test.js

@@ -1,12 +1,16 @@
-require("dotenv").config({ path: "./.env" })
-const path = require("path")
-const { ORM } = require("..")
-const a = require("./tables/a")
-const b = require("./tables/b")
-const c = require("./tables/c")
+import dotenv from "dotenv"
+import path from "path"
+
+dotenv.config({ path: "./.env" })
+
+import { ORM } from "../"
+
+import a from "./tables/a"
+import b from "./tables/b"
+import c from "./tables/c"
 
 const orm = new ORM({
-  tablePath: path.join(__dirname, "tables"),
+  tablePath: path.join("tests","tables"),
   logger: console,
 })