From 5c4d08d6211f7944736474b0a71784eb4d34df13 Mon Sep 17 00:00:00 2001 From: David Nahodyl Date: Thu, 21 May 2026 15:11:47 -0400 Subject: [PATCH] include src in bundle to improve types --- package.json | 19 ++++++++++++------- src/index.ts | 2 +- src/model/Builder.ts | 2 +- src/model/Model.ts | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 95904e2..81ac362 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "name": "vasta-orm", - "version": "0.0.13", + "version": "0.0.14", "description": "Active record ORM built on top of Kysely", "type": "module", "author": "David Nahodyl ", "license": "MIT", "files": [ - "dist" + "dist", + "src" ], "repository": { "type": "git", @@ -24,10 +25,14 @@ ], "exports": { ".": { - "types": "./dist/esm/index.d.ts", - "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "default": "./dist/cjs/index.js" + "import": { + "types": "./src/index.ts", + "default": "./dist/esm/index.js" + }, + "require": { + "types": "./src/index.ts", + "default": "./dist/cjs/index.js" + } } }, "scripts": { @@ -53,7 +58,7 @@ }, "main": "dist/cjs/index.js", "module": "dist/esm/index.js", - "types": "dist/esm/index.d.ts", + "types": "src/index.ts", "devDependencies": { "@eslint/js": "^9.39.4", "@types/node": "^24.12.4", diff --git a/src/index.ts b/src/index.ts index 57b1ec3..52fe6e8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,3 @@ -import { defineModel, RequireSelected } from "@src/model/Model"; +import { defineModel, RequireSelected } from "./model/Model"; export { defineModel, RequireSelected }; diff --git a/src/model/Builder.ts b/src/model/Builder.ts index 3320848..146ee26 100644 --- a/src/model/Builder.ts +++ b/src/model/Builder.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Kysely, Expression, ExpressionBuilder, AliasedExpression, ComparisonOperatorExpression } from "kysely"; -import { Model } from "@src/model/Model"; +import { Model } from "./Model.js"; export type Bivariant = { [K in keyof T]: T[K] extends (...args: infer A) => infer R diff --git a/src/model/Model.ts b/src/model/Model.ts index 8bfde16..0867cab 100644 --- a/src/model/Model.ts +++ b/src/model/Model.ts @@ -3,7 +3,7 @@ import { Insertable, Kysely, Selectable, Updateable } from "kysely"; import { RelationBuilder, AnyModelConstructor } from "./Builder.js"; import { StaticForwarder } from "./StaticForwarder.js"; -import { getCallerMethodName } from "@src/util/caller"; +import { getCallerMethodName } from "../util/caller.js"; export type ModelLifecycleEventName = | "creating"