orchid-orm 1.5.28 → 1.5.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.28",
+  "version": "1.5.30",
   "description": "Postgres ORM",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-setup-and-overview.html",
   "repository": {
@@ -18,13 +18,17 @@
       "types": "./dist/index.d.ts"
     }
   },
+  "files": [
+    "dist"
+  ],
   "jest": {
+    "rootDir": "src",
     "setupFiles": [
       "dotenv/config"
     ],
     "setupFilesAfterEnv": [
-      "../../jest-setup.ts",
-      "./jest-setup.ts"
+      "../../../jest-setup.ts",
+      "../jest-setup.ts"
     ],
     "transform": {
       "^.+\\.ts$": "@swc/jest"
@@ -40,28 +44,13 @@
   "author": "Roman Kushyn",
   "license": "ISC",
   "dependencies": {
-    "pqb": "0.9.16",
+    "pqb": "0.9.18",
     "prompts": "^2.4.2"
   },
   "devDependencies": {
-    "@swc/core": "^1.3.19",
-    "@swc/jest": "^0.2.21",
-    "@types/jest": "^28.1.2",
-    "@types/node": "^18.0.1",
-    "@types/pg": "^8.6.5",
     "@types/prompts": "^2.4.2",
-    "dotenv": "^16.0.1",
-    "jest": "^28.1.2",
-    "orchid-orm-schema-to-zod": "0.2.22",
-    "pg": "^8.7.3",
-    "pg-transactional-tests": "^1.0.7",
-    "rake-db": "2.3.29",
-    "rimraf": "^3.0.2",
-    "rollup": "^2.79.0",
-    "rollup-plugin-dts": "^4.2.2",
-    "rollup-plugin-esbuild": "^4.10.1",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7.4"
+    "orchid-orm-schema-to-zod": "0.2.24",
+    "rake-db": "2.3.31"
   },
   "peerDependencies": {
     "typescript": "*"
@@ -69,7 +58,9 @@
   "scripts": {
     "test": "jest --watch --verbose false",
     "check": "jest",
+    "types": "tsc",
     "test:ci": "jest --coverage --coverageReporters json-summary",
-    "build": "rimraf ./dist/ && rollup -c --rollup.config"
+    "build": "rimraf ./dist/ && rollup -c --rollup.config",
+    "db": "ts-node src/db/dbScripts.ts"
   }
 }

package/.env.example

@@ -1 +0,0 @@
-DATABASE_URL=postgres://username:password@localhost:5432/orchid-orm

package/.turbo/turbo-test.log

@@ -1,26 +0,0 @@
-
-> orchid-orm@1.5.23 test /home/romeo/dev/my/orchid-orm/packages/orm
-> jest "--coverage" "--coverageReporters" "json-summary"
-
-PASS src/bin/init.test.ts
-PASS src/codegen/updateTableFile/changeTable.test.ts
-PASS src/relations/hasAndBelongsToMany.test.ts
-PASS src/codegen/updateMainFile.test.ts
-PASS src/relations/belongsTo.test.ts
-PASS src/relations/hasMany.test.ts
-PASS src/codegen/updateTableFile/createTable.test.ts
-PASS src/relations/hasOne.test.ts
-PASS src/table.test.ts
-PASS src/orm.test.ts
-PASS src/codegen/appCodeUpdater.test.ts
-PASS src/codegen/updateTableFile/renameTable.test.ts
-PASS src/codegen/createBaseTableFile.test.ts
-PASS src/repo.test.ts
-PASS src/relations/relations.test.ts
-PASS src/transaction.test.ts
-
-Test Suites: 16 passed, 16 total
-Tests:       319 passed, 319 total
-Snapshots:   0 total
-Time:        4.516 s
-Ran all test suites.

package/.turbo/turbo-test:ci.log

@@ -1,26 +0,0 @@
-
-> orchid-orm@1.5.24 test:ci /home/romeo/dev/my/orchid-orm/packages/orm
-> jest --coverage --coverageReporters json-summary
-
-PASS src/codegen/createBaseTableFile.test.ts
-PASS src/codegen/updateTableFile/changeTable.test.ts
-PASS src/codegen/appCodeUpdater.test.ts
-PASS src/bin/init.test.ts
-PASS src/codegen/updateMainFile.test.ts
-PASS src/relations/relations.test.ts
-PASS src/codegen/updateTableFile/createTable.test.ts
-PASS src/codegen/updateTableFile/renameTable.test.ts
-PASS src/transaction.test.ts
-PASS src/relations/hasMany.test.ts
-PASS src/table.test.ts
-PASS src/relations/hasOne.test.ts
-PASS src/relations/hasAndBelongsToMany.test.ts
-PASS src/orm.test.ts
-PASS src/relations/belongsTo.test.ts
-PASS src/repo.test.ts
-
-Test Suites: 16 passed, 16 total
-Tests:       319 passed, 319 total
-Snapshots:   0 total
-Time:        6.903 s
-Ran all test suites.

package/CHANGELOG.md

@@ -1,375 +0,0 @@
-# orchid-orm
-
-## 1.5.28
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.16
-
-## 1.5.27
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.15
-
-## 1.5.26
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.14
-
-## 1.5.25
-
-### Patch Changes
-
-- Change relative paths in rake-db config generated by init script
-
-## 1.5.24
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.13
-
-## 1.5.23
-
-### Patch Changes
-
-- Fix relative path resolution on windows for orm codegen
-
-## 1.5.22
-
-### Patch Changes
-
-- Make codegen to not add table to the main file when the key already exist
-
-## 1.5.21
-
-### Patch Changes
-
-- Fix baseTablePath in orm codegen
-
-## 1.5.20
-
-### Patch Changes
-
-- Relative path in rakeDb config
-
-## 1.5.19
-
-### Patch Changes
-
-- Improve init script
-
-## 1.5.18
-
-### Patch Changes
-
-- Add orCreate method
-- Updated dependencies
-  - pqb@0.9.12
-
-## 1.5.17
-
-### Patch Changes
-
-- Improve code generation, fix ssl databaseUrl option
-- Updated dependencies
-  - pqb@0.9.11
-
-## 1.5.16
-
-### Patch Changes
-
-- Improve code generation
-
-## 1.5.15
-
-### Patch Changes
-
-- Improve init script
-
-## 1.5.14
-
-### Patch Changes
-
-- Improve init script
-
-## 1.5.13
-
-### Patch Changes
-
-- Fix init script
-
-## 1.5.12
-
-### Patch Changes
-
-- Add init script
-- Updated dependencies
-  - pqb@0.9.10
-
-## 1.5.11
-
-### Patch Changes
-
-- Override column types via callback
-- Updated dependencies
-  - pqb@0.9.9
-
-## 1.5.10
-
-### Patch Changes
-
-- ee1961e: Make columnTypes optional in configs
-- Updated dependencies [ee1961e]
-  - pqb@0.9.8
-
-## 1.5.9
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.7
-
-## 1.5.8
-
-### Patch Changes
-
-- Fix import path on windows in generated code
-
-## 1.5.7
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.6
-
-## 1.5.6
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.5
-
-## 1.5.5
-
-### Patch Changes
-
-- ESM support for orm
-
-## 1.5.4
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.4
-
-## 1.5.3
-
-### Patch Changes
-
-- Change package.json exports for esm support
-- Updated dependencies
-  - pqb@0.9.3
-
-## 1.5.2
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.2
-
-## 1.5.1
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.9.1
-
-## 1.5.0
-
-### Minor Changes
-
-- Change index options: column or expression is required, operator renamed to opclass
-
-### Patch Changes
-
-- f1cd5db: Handle multiple indexes and foreignKeys of the column
-- Updated dependencies
-- Updated dependencies [f1cd5db]
-  - pqb@0.9.0
-
-## 1.4.22
-
-### Patch Changes
-
-- Change inner aspects of columns
-- Updated dependencies
-  - pqb@0.8.5
-
-## 1.4.21
-
-### Patch Changes
-
-- Add --code cli argument to rake-db
-- Improve codegen
-- Updated dependencies
-- Updated dependencies
-  - pqb@0.8.4
-
-## 1.4.19
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.8.3
-
-## 1.4.18
-
-### Patch Changes
-
-- Add code generator to change project files after migrations
-- Updated dependencies
-  - pqb@0.8.2
-
-## 1.4.17
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.8.1
-
-## 2.0.0
-
-### Minor Changes
-
-- 3f25b4d: Rename all model words to table words, because all models here are not models in OOP meaning
-
-### Patch Changes
-
-- Updated dependencies [3f25b4d]
-  - pqb@0.8.0
-  - rake-db@2.2.0
-
-## 1.3.16
-
-### Patch Changes
-
-- Refactor create and update of relations
-- Updated dependencies
-  - pqb@0.7.13
-
-## 1.3.15
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.7.12
-
-## 1.3.14
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.7.11
-
-## 1.3.13
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.7.10
-
-## 1.3.12
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.7.9
-
-## 1.3.11
-
-### Patch Changes
-
-- Change connectionString to databaseURL option, add ssl option
-- Updated dependencies
-  - pqb@0.7.8
-
-## 1.3.10
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.7.7
-
-## 1.3.9
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.7.6
-
-## 1.3.8
-
-### Patch Changes
-
-- Updated dependencies
-  - pqb@0.7.5
-
-## 1.3.7
-
-### Patch Changes
-
-- Update homepage link in package.json
-- Updated dependencies
-  - pqb@0.7.4
-
-## 1.3.6
-
-### Patch Changes
-
-- Add required min and max parameters to text column
-- Updated dependencies
-  - pqb@0.7.3
-
-## 1.3.5
-
-### Patch Changes
-
-- Check if through and source relations are defined
-
-## 1.3.4
-
-### Patch Changes
-
-- Updated dependencies [9b8b3d5]
-  - pqb@0.7.2
-
-## 1.3.3
-
-### Patch Changes
-
-- Handle tables without primary key
-- Updated dependencies
-  - pqb@0.7.1
-
-## 1.3.2
-
-### Patch Changes
-
-- 1147182: Run relation callbacks when creating/updating/deleting in a nested way
-
-## 1.3.0
-
-### Minor Changes
-
-- 883c3e4: Add changeset
-
-### Patch Changes
-
-- Updated dependencies [883c3e4]
-  - pqb@0.7.0

package/coverage/coverage-summary.json

@@ -1,28 +0,0 @@
-{"total": {"lines":{"total":1405,"covered":1370,"skipped":0,"pct":97.5},"statements":{"total":1542,"covered":1472,"skipped":0,"pct":95.46},"functions":{"total":352,"covered":334,"skipped":0,"pct":94.88},"branches":{"total":631,"covered":557,"skipped":0,"pct":88.27},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/orm.ts": {"lines":{"total":24,"covered":23,"skipped":0,"pct":95.83},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":26,"covered":25,"skipped":0,"pct":96.15},"branches":{"total":5,"covered":4,"skipped":0,"pct":80}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/repo.ts": {"lines":{"total":19,"covered":19,"skipped":0,"pct":100},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":20,"covered":20,"skipped":0,"pct":100},"branches":{"total":1,"covered":1,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/table.ts": {"lines":{"total":14,"covered":14,"skipped":0,"pct":100},"functions":{"total":9,"covered":9,"skipped":0,"pct":100},"statements":{"total":15,"covered":15,"skipped":0,"pct":100},"branches":{"total":3,"covered":3,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/transaction.ts": {"lines":{"total":15,"covered":15,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":15,"covered":15,"skipped":0,"pct":100},"branches":{"total":3,"covered":3,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/utils.ts": {"lines":{"total":6,"covered":6,"skipped":0,"pct":100},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":9,"covered":9,"skipped":0,"pct":100},"branches":{"total":2,"covered":1,"skipped":0,"pct":50}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/bin/init.ts": {"lines":{"total":150,"covered":147,"skipped":0,"pct":98},"functions":{"total":24,"covered":22,"skipped":0,"pct":91.66},"statements":{"total":160,"covered":156,"skipped":0,"pct":97.5},"branches":{"total":59,"covered":59,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/appCodeUpdater.ts": {"lines":{"total":18,"covered":17,"skipped":0,"pct":94.44},"functions":{"total":7,"covered":6,"skipped":0,"pct":85.71},"statements":{"total":19,"covered":18,"skipped":0,"pct":94.73},"branches":{"total":5,"covered":3,"skipped":0,"pct":60}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/createBaseTableFile.ts": {"lines":{"total":7,"covered":7,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":9,"covered":9,"skipped":0,"pct":100},"branches":{"total":1,"covered":1,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/fileChanges.ts": {"lines":{"total":16,"covered":16,"skipped":0,"pct":100},"functions":{"total":7,"covered":7,"skipped":0,"pct":100},"statements":{"total":16,"covered":16,"skipped":0,"pct":100},"branches":{"total":9,"covered":8,"skipped":0,"pct":88.88}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/testUtils.ts": {"lines":{"total":18,"covered":18,"skipped":0,"pct":100},"functions":{"total":9,"covered":9,"skipped":0,"pct":100},"statements":{"total":24,"covered":24,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/tsUtils.ts": {"lines":{"total":46,"covered":42,"skipped":0,"pct":91.3},"functions":{"total":15,"covered":15,"skipped":0,"pct":100},"statements":{"total":51,"covered":45,"skipped":0,"pct":88.23},"branches":{"total":36,"covered":27,"skipped":0,"pct":75}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateMainFile.ts": {"lines":{"total":90,"covered":84,"skipped":0,"pct":93.33},"functions":{"total":9,"covered":9,"skipped":0,"pct":100},"statements":{"total":97,"covered":88,"skipped":0,"pct":90.72},"branches":{"total":36,"covered":26,"skipped":0,"pct":72.22}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/utils.ts": {"lines":{"total":5,"covered":5,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":6,"covered":6,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/changeTable.ts": {"lines":{"total":248,"covered":240,"skipped":0,"pct":96.77},"functions":{"total":25,"covered":24,"skipped":0,"pct":96},"statements":{"total":281,"covered":255,"skipped":0,"pct":90.74},"branches":{"total":146,"covered":118,"skipped":0,"pct":80.82}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/createTable.ts": {"lines":{"total":21,"covered":20,"skipped":0,"pct":95.23},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":22,"covered":21,"skipped":0,"pct":95.45},"branches":{"total":3,"covered":2,"skipped":0,"pct":66.66}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/renameTable.ts": {"lines":{"total":30,"covered":30,"skipped":0,"pct":100},"functions":{"total":4,"covered":3,"skipped":0,"pct":75},"statements":{"total":36,"covered":32,"skipped":0,"pct":88.88},"branches":{"total":22,"covered":18,"skipped":0,"pct":81.81}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/codegen/updateTableFile/updateTableFile.ts": {"lines":{"total":11,"covered":11,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":12,"covered":12,"skipped":0,"pct":100},"branches":{"total":7,"covered":7,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/belongsTo.ts": {"lines":{"total":111,"covered":111,"skipped":0,"pct":100},"functions":{"total":28,"covered":28,"skipped":0,"pct":100},"statements":{"total":114,"covered":114,"skipped":0,"pct":100},"branches":{"total":69,"covered":68,"skipped":0,"pct":98.55}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/hasAndBelongsToMany.ts": {"lines":{"total":128,"covered":128,"skipped":0,"pct":100},"functions":{"total":41,"covered":41,"skipped":0,"pct":100},"statements":{"total":136,"covered":136,"skipped":0,"pct":100},"branches":{"total":31,"covered":30,"skipped":0,"pct":96.77}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/hasMany.ts": {"lines":{"total":97,"covered":97,"skipped":0,"pct":100},"functions":{"total":33,"covered":33,"skipped":0,"pct":100},"statements":{"total":102,"covered":102,"skipped":0,"pct":100},"branches":{"total":37,"covered":35,"skipped":0,"pct":94.59}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/hasOne.ts": {"lines":{"total":82,"covered":82,"skipped":0,"pct":100},"functions":{"total":27,"covered":27,"skipped":0,"pct":100},"statements":{"total":86,"covered":86,"skipped":0,"pct":100},"branches":{"total":35,"covered":35,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/relations.ts": {"lines":{"total":98,"covered":93,"skipped":0,"pct":94.89},"functions":{"total":10,"covered":10,"skipped":0,"pct":100},"statements":{"total":101,"covered":96,"skipped":0,"pct":95.04},"branches":{"total":52,"covered":45,"skipped":0,"pct":86.53}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/relations/utils.ts": {"lines":{"total":34,"covered":34,"skipped":0,"pct":100},"functions":{"total":11,"covered":11,"skipped":0,"pct":100},"statements":{"total":39,"covered":39,"skipped":0,"pct":100},"branches":{"total":38,"covered":38,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/test-utils/test-db.ts": {"lines":{"total":5,"covered":5,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":8,"covered":8,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/test-utils/test-tables.ts": {"lines":{"total":59,"covered":53,"skipped":0,"pct":89.83},"functions":{"total":45,"covered":33,"skipped":0,"pct":73.33},"statements":{"total":74,"covered":62,"skipped":0,"pct":83.78},"branches":{"total":2,"covered":2,"skipped":0,"pct":100}}
-,"/home/romeo/dev/my/orchid-orm/packages/orm/src/test-utils/test-utils.ts": {"lines":{"total":53,"covered":53,"skipped":0,"pct":100},"functions":{"total":21,"covered":20,"skipped":0,"pct":95.23},"statements":{"total":64,"covered":63,"skipped":0,"pct":98.43},"branches":{"total":25,"covered":19,"skipped":0,"pct":76}}
-}

package/jest-setup.ts

@@ -1,11 +0,0 @@
-jest.mock('pqb', () => require('../qb/pqb/src'), {
-  virtual: true,
-});
-
-jest.mock('rake-db', () => require('../rake-db/src'), {
-  virtual: true,
-});
-
-jest.mock('orchid-orm-schema-to-zod', () => require('../schema-to-zod/src'), {
-  virtual: true,
-});

package/rollup.config.js

@@ -1,18 +0,0 @@
-import config from '../../rollup.config';
-import esbuild from 'rollup-plugin-esbuild';
-
-export default [
-  ...config,
-  {
-    input: 'src/bin/bin.ts',
-    plugins: [esbuild()],
-    output: [
-      {
-        banner: '#!/usr/bin/env node',
-        file: 'dist/bin.js',
-        format: 'cjs',
-        sourcemap: true,
-      },
-    ],
-  },
-];

package/src/bin/bin.ts

@@ -1,3 +0,0 @@
-import { askOrchidORMConfig, initOrchidORM } from './init';
-
-askOrchidORMConfig().then(initOrchidORM);