@abedmurrar/objection 4.0.0-alpha.0 → 4.0.0-beta.1

package/lib/utils/resolveModel.js

@@ -1,107 +1,104 @@
-'use strict';
-
-const path = require('path');
-const { isString, isFunction } = require('../utils/objectUtils');
-
-class ResolveError extends Error {}
-
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveModel = resolveModel;
+exports.isModelClass = isModelClass;
+const node_path_1 = __importDefault(require("node:path"));
+const objectUtils_1 = require("../utils/objectUtils");
+class ResolveError extends Error {
+}
 function resolveModel(modelRef, modelPaths, errorPrefix) {
-  try {
-    if (isString(modelRef)) {
-      if (isAbsolutePath(modelRef)) {
-        return requireModel(modelRef);
-      } else if (modelPaths) {
-        return requireUsingModelPaths(modelRef, modelPaths);
-      }
-    } else {
-      if (isFunction(modelRef) && !isModelClass(modelRef)) {
-        modelRef = modelRef();
-      }
-
-      if (!isModelClass(modelRef)) {
-        throw new ResolveError(
-          `is not a subclass of Model or a file path to a module that exports one. You may be dealing with a require loop. See the documentation section about require loops.`,
-        );
-      }
-
-      return modelRef;
+    try {
+        if ((0, objectUtils_1.isString)(modelRef)) {
+            if (isAbsolutePath(modelRef)) {
+                return requireModel(modelRef);
+            }
+            else if (modelPaths) {
+                return requireUsingModelPaths(modelRef, modelPaths);
+            }
+        }
+        else {
+            if ((0, objectUtils_1.isFunction)(modelRef) && !isModelClass(modelRef)) {
+                modelRef = modelRef();
+            }
+            if (!isModelClass(modelRef)) {
+                throw new ResolveError(`is not a subclass of Model or a file path to a module that exports one. You may be dealing with a require loop. See the documentation section about require loops.`);
+            }
+            return modelRef;
+        }
     }
-  } catch (err) {
-    if (err instanceof ResolveError) {
-      throw new Error(`${errorPrefix}: ${err.message}`);
-    } else {
-      throw err;
+    catch (err) {
+        if (err instanceof ResolveError) {
+            throw new Error(`${errorPrefix}: ${err.message}`);
+        }
+        else {
+            throw err;
+        }
     }
-  }
+    // A relative path without `modelPaths` doesn't resolve to anything.
+    return undefined;
 }
-
 function requireUsingModelPaths(modelRef, modelPaths) {
-  let firstError = null;
-
-  for (const modelPath of modelPaths) {
-    try {
-      return requireModel(path.join(modelPath, modelRef));
-    } catch (err) {
-      if (firstError === null) {
-        firstError = err;
-      }
+    let firstError = null;
+    for (const modelPath of modelPaths) {
+        try {
+            return requireModel(node_path_1.default.join(modelPath, modelRef));
+        }
+        catch (err) {
+            if (firstError === null) {
+                firstError = err;
+            }
+        }
+    }
+    if (firstError) {
+        throw firstError;
+    }
+    else {
+        throw new ResolveError(`could not resolve ${modelRef} using modelPaths`);
     }
-  }
-
-  if (firstError) {
-    throw firstError;
-  } else {
-    throw new ResolveError(`could not resolve ${modelRef} using modelPaths`);
-  }
 }
-
 function requireModel(modelPath) {
-  /**
-   * Wrap path string in template literal to prevent
-   * warnings about Objection.JS being an expression
-   * in webpack builds.
-   * @link https://github.com/webpack/webpack/issues/196
-   */
-  let mod = require(`${path.resolve(modelPath)}`);
-  let modelClass = null;
-
-  if (isModelClass(mod)) {
-    modelClass = mod;
-  } else if (isModelClass(mod.default)) {
-    // Babel 6 style of exposing default export.
-    modelClass = mod.default;
-  } else {
-    Object.keys(mod).forEach((exportName) => {
-      const exp = mod[exportName];
-
-      if (isModelClass(exp)) {
-        if (modelClass !== null) {
-          throw new ResolveError(
-            `path ${modelPath} exports multiple models. Don't know which one to choose.`,
-          );
-        }
-
-        modelClass = exp;
-      }
-    });
-  }
-
-  if (!isModelClass(modelClass)) {
-    throw new ResolveError(`${modelPath} is an invalid file path to a model class`);
-  }
-
-  return modelClass;
+    /**
+     * Wrap path string in template literal to prevent
+     * warnings about Objection.JS being an expression
+     * in webpack builds.
+     * @link https://github.com/webpack/webpack/issues/196
+     */
+    // The module is the user's, so its exports can be anything.
+    const mod = require(`${node_path_1.default.resolve(modelPath)}`);
+    let modelClass = null;
+    if (isModelClass(mod)) {
+        modelClass = mod;
+    }
+    else if (isModelClass(mod.default)) {
+        // Babel 6 style of exposing default export.
+        modelClass = mod.default;
+    }
+    else {
+        Object.keys(mod).forEach((exportName) => {
+            const exp = mod[exportName];
+            if (isModelClass(exp)) {
+                if (modelClass !== null) {
+                    throw new ResolveError(`path ${modelPath} exports multiple models. Don't know which one to choose.`);
+                }
+                modelClass = exp;
+            }
+        });
+    }
+    if (!isModelClass(modelClass)) {
+        throw new ResolveError(`${modelPath} is an invalid file path to a model class`);
+    }
+    return modelClass;
 }
-
 function isAbsolutePath(pth) {
-  return path.normalize(pth + '/') === path.normalize(path.resolve(pth) + '/');
+    return node_path_1.default.normalize(pth + '/') === node_path_1.default.normalize(node_path_1.default.resolve(pth) + '/');
 }
-
+// The `T &` keeps an `any` argument `any`.
 function isModelClass(maybeModel) {
-  return isFunction(maybeModel) && maybeModel.isObjectionModelClass;
+    // This returns the value of `isObjectionModelClass` as is, like the
+    // JavaScript code did. It's `true` on model classes.
+    return ((0, objectUtils_1.isFunction)(maybeModel) &&
+        maybeModel.isObjectionModelClass);
 }
-
-module.exports = {
-  resolveModel,
-  isModelClass,
-};

package/lib/utils/tmpColumnUtils.js

@@ -1,16 +1,7 @@
-'use strict';
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTempColumn = getTempColumn;
 const OWNER_JOIN_COLUMN_ALIAS_PREFIX = 'objectiontmpjoin';
-
 function getTempColumn(index) {
-  return `${OWNER_JOIN_COLUMN_ALIAS_PREFIX}${index}`;
+    return `${OWNER_JOIN_COLUMN_ALIAS_PREFIX}${index}`;
 }
-
-function isTempColumn(col) {
-  return col.startsWith(OWNER_JOIN_COLUMN_ALIAS_PREFIX);
-}
-
-module.exports = {
-  getTempColumn,
-  isTempColumn,
-};

package/package.json

@@ -1,21 +1,45 @@
 {
   "name": "@abedmurrar/objection",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0-beta.1",
   "description": "An SQL-friendly ORM for Node.js. A fork of objection.js with strict TypeScript types and MySQL support.",
   "main": "lib/objection.js",
+  "type": "commonjs",
+  "types": "./typings/objection/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./typings/objection/index.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./typings/objection/index.d.ts",
+        "default": "./lib/objection.js"
+      }
+    },
+    "./package.json": "./package.json"
+  },
   "license": "MIT",
   "scripts": {
-    "test": "npm run eslint && mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\" && npm run test:typings",
+    "build": "tsc -p tsconfig.build.json",
+    "prepare": "npm run build",
+    "pretest": "npm run build",
+    "test": "npm run lint && mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\" && npm run test:typings",
+    "pretest:fast": "npm run build",
     "test:fast": "mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --bail --exclude \"tests/unit/relations/files/**\"",
-    "test:typings": "node scripts/generate-fn-typings.js --check && tsc && tsc -p tests/ts/tsconfig.loose.json && node scripts/typings-errors.js",
-    "test:typings:ts7": "npx -y -p typescript@7 tsc -p tests/ts/tsconfig.ts7.json",
+    "test:typings": "npm run build && node scripts/generate-fn-typings.js --check && node scripts/generate-esm-typings.js --check && tsc && tsc -p tests/ts/tsconfig.loose.json && node scripts/typings-errors.js && attw --pack .",
     "bench:typings": "node scripts/typings-bench.js",
-    "prettier": "prettier --write \"{examples,lib,tests,testUtils,typings,doc}/**/*.{js,ts}\"",
-    "eslint": "eslint --format codeframe \"examples/**/*.js\" \"lib/**/*.js\" \"tests/**/*.js\"",
-    "docs:dev": "vuepress dev doc",
-    "docs:build": "vuepress build doc",
+    "prebench": "npm run build",
+    "bench": "node bench/run.js",
+    "prebench:compare": "npm run build",
+    "bench:compare": "node bench/compare.js",
+    "format": "biome check --write",
+    "lint": "biome check",
+    "docs:dev": "vitepress dev doc",
+    "docs:build": "vitepress build doc",
+    "docs:preview": "vitepress preview doc",
     "release": "node scripts/release.js",
-    "prepublishOnly": "npm run eslint && npm run test:typings"
+    "prepublishOnly": "npm run build && npm run lint && npm run test:typings",
+    "sql-check": "npm run build && node bench/sql-check.js"
   },
   "publishConfig": {
     "access": "public",
@@ -41,7 +65,7 @@
   },
   "homepage": "https://github.com/abedmurrar/objection.js#readme",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=24"
   },
   "keywords": [
     "orm",
@@ -56,33 +80,36 @@
   "files": [
     "README.md",
     "LICENSE",
-    "lib/*",
+    "lib/**/*.js",
+    "lib/**/*.mjs",
     "typings/*"
   ],
-  "types": "./typings/objection/index.d.ts",
   "dependencies": {
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",
     "db-errors": "^0.2.3"
   },
   "peerDependencies": {
-    "knex": ">=3.1.0"
+    "knex": ">=3.3.0"
   },
   "devDependencies": {
-    "@types/node": "^22.15.3",
-    "chai": "^4.3.10",
+    "@arethetypeswrong/cli": "^0.18.5",
+    "@biomejs/biome": "2.6.4",
+    "@types/node": "^24.19.2",
+    "chai": "^6.3.0",
     "chai-subset": "^1.6.0",
-    "eslint": "^8.54.0",
-    "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-prettier": "^5.3.1",
     "expect.js": "^0.3.1",
     "knex": "^3.3.0",
-    "mocha": "^11.2.2",
+    "mariadb": "^3.5.4",
+    "mocha": "^12.0.3",
     "mysql2": "^3.24.6",
     "pg": "^8.15.6",
-    "prettier": "3.5.3",
-    "sqlite3": "^5.1.7",
-    "typescript": "~5.8.3",
-    "vuepress": "1.9.10"
+    "sqlite3": "^6.0.1",
+    "typescript": "^7.0.2",
+    "vitepress": "2.0.0-alpha.21"
+  },
+  "overrides": {
+    "glob": "^14.0.3",
+    "minimatch": "^11.0.3"
   }
 }