orchid-orm 1.69.0 → 1.69.2

package/dist/node-postgres.d.ts

@@ -1,10 +1,11 @@
-import { OrchidORM, OrchidOrmParam, TableClasses } from "orchid-orm";
+import { OrchidORM, OrchidORMTables, OrchidOrmParam, TableClasses } from "orchid-orm";
 import { NodePostgresAdapterOptions } from "pqb/node-postgres";
 import { DbSharedOptions } from "pqb/internal";
 declare const Adapter: any;
 declare const createDb: any;
-declare const orchidORM: <T extends TableClasses>({
+declare const makeOrchidOrmDb: <T extends TableClasses>(orm: OrchidORMTables<T>, {
   log,
   ...options
-}: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>, tables: T) => OrchidORM<T>;
-export { Adapter, createDb, orchidORM };
+}: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>) => OrchidORM<T>;
+declare const orchidORM: <T extends TableClasses>(options: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>, tables: T) => OrchidORM<T>;
+export { Adapter, createDb, makeOrchidOrmDb, orchidORM };

package/dist/node-postgres.js

@@ -4,18 +4,22 @@ let pqb_node_postgres = require("pqb/node-postgres");
 let pqb_internal = require("pqb/internal");
 const Adapter = pqb_node_postgres.NodePostgresAdapter;
 const createDb = pqb_node_postgres.createDb;
-const orchidORM = ({ log, ...options }, tables) => {
-	return (0, orchid_orm.orchidORMWithAdapter)({
+const makeOrchidOrmDb = (orm, { log, ...options }) => {
+	return (0, orchid_orm.makeOrchidOrmDbWithAdapter)(orm, {
 		...options,
 		adapter: new pqb_internal.AdapterClass({
 			driverAdapter: pqb_node_postgres.NodePostgresAdapter,
 			config: options
 		}),
 		log
-	}, tables);
+	});
+};
+const orchidORM = (options, tables) => {
+	return makeOrchidOrmDb((0, orchid_orm.bundleOrchidORMTables)(tables), options);
 };
 exports.Adapter = Adapter;
 exports.createDb = createDb;
+exports.makeOrchidOrmDb = makeOrchidOrmDb;
 exports.orchidORM = orchidORM;
 
 //# sourceMappingURL=node-postgres.js.map

package/dist/node-postgres.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-postgres.js","names":["NodePostgresAdapter","cdb","AdapterClass"],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidOrmParam,\n  orchidORMWithAdapter,\n} from 'orchid-orm';\nimport {\n  NodePostgresAdapter,\n  NodePostgresAdapterOptions,\n  createDb as cdb,\n} from 'pqb/node-postgres';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport const Adapter = NodePostgresAdapter;\n\nexport const createDb = cdb;\n\nexport const orchidORM = <T extends TableClasses>(\n  {\n    log,\n    ...options\n  }: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  return orchidORMWithAdapter(\n    {\n      ...options,\n      adapter: new AdapterClass({\n        driverAdapter: NodePostgresAdapter,\n        config: options,\n      }),\n      log,\n    },\n    tables,\n  );\n};\n"],"mappings":";;;;AAaA,MAAa,UAAUA,kBAAAA;AAEvB,MAAa,WAAWC,kBAAAA;AAExB,MAAa,aACX,EACE,KACA,GAAG,WAEL,WACiB;AACjB,SAAA,GAAA,WAAA,sBACE;EACE,GAAG;EACH,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,kBAAAA;GACf,QAAQ;GACT,CAAC;EACF;EACD,EACD,OACD"}
+{"version":3,"file":"node-postgres.js","names":["NodePostgresAdapter","cdb","AdapterClass"],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport {\n  NodePostgresAdapter,\n  NodePostgresAdapterOptions,\n  createDb as cdb,\n} from 'pqb/node-postgres';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport const Adapter = NodePostgresAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  {\n    log,\n    ...options\n  }: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    adapter: new AdapterClass({\n      driverAdapter: NodePostgresAdapter,\n      config: options,\n    }),\n    log,\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;;AAeA,MAAa,UAAUA,kBAAAA;AAEvB,MAAa,WAAWC,kBAAAA;AAExB,MAAa,mBACX,KACA,EACE,KACA,GAAG,cAEY;AACjB,SAAA,GAAA,WAAA,4BAAkC,KAAK;EACrC,GAAG;EACH,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,kBAAAA;GACf,QAAQ;GACT,CAAC;EACF;EACD,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,iBAAA,GAAA,WAAA,uBAD2B,OAAO,EACb,QAAQ"}

package/dist/node-postgres.mjs

@@ -1,18 +1,21 @@
-import { orchidORMWithAdapter } from "orchid-orm";
+import { bundleOrchidORMTables, makeOrchidOrmDbWithAdapter } from "orchid-orm";
 import { NodePostgresAdapter, createDb as createDb$1 } from "pqb/node-postgres";
 import { AdapterClass } from "pqb/internal";
 const Adapter = NodePostgresAdapter;
 const createDb = createDb$1;
-const orchidORM = ({ log, ...options }, tables) => {
-	return orchidORMWithAdapter({
+const makeOrchidOrmDb = (orm, { log, ...options }) => {
+	return makeOrchidOrmDbWithAdapter(orm, {
 		...options,
 		adapter: new AdapterClass({
 			driverAdapter: NodePostgresAdapter,
 			config: options
 		}),
 		log
-	}, tables);
+	});
 };
-export { Adapter, createDb, orchidORM };
+const orchidORM = (options, tables) => {
+	return makeOrchidOrmDb(bundleOrchidORMTables(tables), options);
+};
+export { Adapter, createDb, makeOrchidOrmDb, orchidORM };
 
 //# sourceMappingURL=node-postgres.mjs.map

package/dist/node-postgres.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"node-postgres.mjs","names":["cdb"],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidOrmParam,\n  orchidORMWithAdapter,\n} from 'orchid-orm';\nimport {\n  NodePostgresAdapter,\n  NodePostgresAdapterOptions,\n  createDb as cdb,\n} from 'pqb/node-postgres';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport const Adapter = NodePostgresAdapter;\n\nexport const createDb = cdb;\n\nexport const orchidORM = <T extends TableClasses>(\n  {\n    log,\n    ...options\n  }: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  return orchidORMWithAdapter(\n    {\n      ...options,\n      adapter: new AdapterClass({\n        driverAdapter: NodePostgresAdapter,\n        config: options,\n      }),\n      log,\n    },\n    tables,\n  );\n};\n"],"mappings":";;;AAaA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,aACX,EACE,KACA,GAAG,WAEL,WACiB;AACjB,QAAO,qBACL;EACE,GAAG;EACH,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACF;EACD,EACD,OACD"}
+{"version":3,"file":"node-postgres.mjs","names":["cdb"],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport {\n  NodePostgresAdapter,\n  NodePostgresAdapterOptions,\n  createDb as cdb,\n} from 'pqb/node-postgres';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport const Adapter = NodePostgresAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  {\n    log,\n    ...options\n  }: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    adapter: new AdapterClass({\n      driverAdapter: NodePostgresAdapter,\n      config: options,\n    }),\n    log,\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<NodePostgresAdapterOptions & DbSharedOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;AAeA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,mBACX,KACA,EACE,KACA,GAAG,cAEY;AACjB,QAAO,2BAA2B,KAAK;EACrC,GAAG;EACH,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACF;EACD,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,gBADK,sBAAsB,OAAO,EACb,QAAQ"}

package/dist/postgres-js.d.ts

@@ -1,11 +1,12 @@
-import { OrchidORM, OrchidOrmParam, TableClasses } from "orchid-orm";
+import { OrchidORM, OrchidORMTables, OrchidOrmParam, TableClasses } from "orchid-orm";
 import { PostgresJsAdapterOptions } from "pqb/postgres-js";
 import { DbSharedOptions } from "pqb/internal";
 interface PostgresJsOrchidORMOptions extends PostgresJsAdapterOptions, DbSharedOptions {}
 declare const Adapter: any;
 declare const createDb: any;
-declare const orchidORM: <T extends TableClasses>({
+declare const makeOrchidOrmDb: <T extends TableClasses>(orm: OrchidORMTables<T>, {
   log,
   ...options
-}: OrchidOrmParam<PostgresJsOrchidORMOptions>, tables: T) => OrchidORM<T>;
-export { Adapter, PostgresJsOrchidORMOptions, createDb, orchidORM };
+}: OrchidOrmParam<PostgresJsOrchidORMOptions>) => OrchidORM<T>;
+declare const orchidORM: <T extends TableClasses>(options: OrchidOrmParam<PostgresJsOrchidORMOptions>, tables: T) => OrchidORM<T>;
+export { Adapter, PostgresJsOrchidORMOptions, createDb, makeOrchidOrmDb, orchidORM };

package/dist/postgres-js.js

@@ -4,18 +4,22 @@ let pqb_postgres_js = require("pqb/postgres-js");
 let pqb_internal = require("pqb/internal");
 const Adapter = pqb_postgres_js.PostgresJsAdapter;
 const createDb = pqb_postgres_js.createDb;
-const orchidORM = ({ log, ...options }, tables) => {
-	return (0, orchid_orm.orchidORMWithAdapter)({
+const makeOrchidOrmDb = (orm, { log, ...options }) => {
+	return (0, orchid_orm.makeOrchidOrmDbWithAdapter)(orm, {
 		...options,
 		log,
 		adapter: new pqb_internal.AdapterClass({
 			driverAdapter: pqb_postgres_js.PostgresJsAdapter,
 			config: options
 		})
-	}, tables);
+	});
+};
+const orchidORM = (options, tables) => {
+	return makeOrchidOrmDb((0, orchid_orm.bundleOrchidORMTables)(tables), options);
 };
 exports.Adapter = Adapter;
 exports.createDb = createDb;
+exports.makeOrchidOrmDb = makeOrchidOrmDb;
 exports.orchidORM = orchidORM;
 
 //# sourceMappingURL=postgres-js.js.map

package/dist/postgres-js.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-js.js","names":["PostgresJsAdapter","cdb","AdapterClass"],"sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidOrmParam,\n  orchidORMWithAdapter,\n} from 'orchid-orm';\nimport {\n  PostgresJsAdapter,\n  PostgresJsAdapterOptions,\n  createDb as cdb,\n} from 'pqb/postgres-js';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport interface PostgresJsOrchidORMOptions\n  extends PostgresJsAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = PostgresJsAdapter;\n\nexport const createDb = cdb;\n\nexport const orchidORM = <T extends TableClasses>(\n  { log, ...options }: OrchidOrmParam<PostgresJsOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  return orchidORMWithAdapter(\n    {\n      ...options,\n      log,\n      adapter: new AdapterClass({\n        driverAdapter: PostgresJsAdapter,\n        config: options,\n      }),\n    },\n    tables,\n  );\n};\n"],"mappings":";;;;AAgBA,MAAa,UAAUA,gBAAAA;AAEvB,MAAa,WAAWC,gBAAAA;AAExB,MAAa,aACX,EAAE,KAAK,GAAG,WACV,WACiB;AACjB,SAAA,GAAA,WAAA,sBACE;EACE,GAAG;EACH;EACA,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,gBAAAA;GACf,QAAQ;GACT,CAAC;EACH,EACD,OACD"}
+{"version":3,"file":"postgres-js.js","names":["PostgresJsAdapter","cdb","AdapterClass"],"sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport {\n  PostgresJsAdapter,\n  PostgresJsAdapterOptions,\n  createDb as cdb,\n} from 'pqb/postgres-js';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport interface PostgresJsOrchidORMOptions\n  extends PostgresJsAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = PostgresJsAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  { log, ...options }: OrchidOrmParam<PostgresJsOrchidORMOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: PostgresJsAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<PostgresJsOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;;AAkBA,MAAa,UAAUA,gBAAAA;AAEvB,MAAa,WAAWC,gBAAAA;AAExB,MAAa,mBACX,KACA,EAAE,KAAK,GAAG,cACO;AACjB,SAAA,GAAA,WAAA,4BAAkC,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,gBAAAA;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,iBAAA,GAAA,WAAA,uBAD2B,OAAO,EACb,QAAQ"}

package/dist/postgres-js.mjs

@@ -1,18 +1,21 @@
-import { orchidORMWithAdapter } from "orchid-orm";
+import { bundleOrchidORMTables, makeOrchidOrmDbWithAdapter } from "orchid-orm";
 import { PostgresJsAdapter, createDb as createDb$1 } from "pqb/postgres-js";
 import { AdapterClass } from "pqb/internal";
 const Adapter = PostgresJsAdapter;
 const createDb = createDb$1;
-const orchidORM = ({ log, ...options }, tables) => {
-	return orchidORMWithAdapter({
+const makeOrchidOrmDb = (orm, { log, ...options }) => {
+	return makeOrchidOrmDbWithAdapter(orm, {
 		...options,
 		log,
 		adapter: new AdapterClass({
 			driverAdapter: PostgresJsAdapter,
 			config: options
 		})
-	}, tables);
+	});
 };
-export { Adapter, createDb, orchidORM };
+const orchidORM = (options, tables) => {
+	return makeOrchidOrmDb(bundleOrchidORMTables(tables), options);
+};
+export { Adapter, createDb, makeOrchidOrmDb, orchidORM };
 
 //# sourceMappingURL=postgres-js.mjs.map

package/dist/postgres-js.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-js.mjs","names":["cdb"],"sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidOrmParam,\n  orchidORMWithAdapter,\n} from 'orchid-orm';\nimport {\n  PostgresJsAdapter,\n  PostgresJsAdapterOptions,\n  createDb as cdb,\n} from 'pqb/postgres-js';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport interface PostgresJsOrchidORMOptions\n  extends PostgresJsAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = PostgresJsAdapter;\n\nexport const createDb = cdb;\n\nexport const orchidORM = <T extends TableClasses>(\n  { log, ...options }: OrchidOrmParam<PostgresJsOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  return orchidORMWithAdapter(\n    {\n      ...options,\n      log,\n      adapter: new AdapterClass({\n        driverAdapter: PostgresJsAdapter,\n        config: options,\n      }),\n    },\n    tables,\n  );\n};\n"],"mappings":";;;AAgBA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,aACX,EAAE,KAAK,GAAG,WACV,WACiB;AACjB,QAAO,qBACL;EACE,GAAG;EACH;EACA,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACH,EACD,OACD"}
+{"version":3,"file":"postgres-js.mjs","names":["cdb"],"sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport {\n  PostgresJsAdapter,\n  PostgresJsAdapterOptions,\n  createDb as cdb,\n} from 'pqb/postgres-js';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\n\nexport interface PostgresJsOrchidORMOptions\n  extends PostgresJsAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = PostgresJsAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  { log, ...options }: OrchidOrmParam<PostgresJsOrchidORMOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: PostgresJsAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<PostgresJsOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;AAkBA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,mBACX,KACA,EAAE,KAAK,GAAG,cACO;AACjB,QAAO,2BAA2B,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,gBADK,sBAAsB,OAAO,EACb,QAAQ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.69.0",
+  "version": "1.69.2",
   "description": "Postgres ORM",
   "keywords": [
     "orm",
@@ -99,14 +99,14 @@
   "dependencies": {
     "inflection": "*",
     "prompts": "2.4.2",
-    "pqb": "0.66.0",
-    "rake-db": "2.33.7"
+    "rake-db": "2.33.9",
+    "pqb": "0.66.2"
   },
   "devDependencies": {
     "@types/prompts": "2.4.2",
     "zod": "4.3.6",
-    "test-utils": "0.3.6",
-    "orchid-orm-schema-to-zod": "1.0.82"
+    "orchid-orm-schema-to-zod": "1.0.84",
+    "test-utils": "0.3.6"
   },
   "peerDependencies": {
     "typescript": "*"