procbay-schema 1.0.171 → 1.0.174

package/package.json

@@ -1,27 +1,19 @@
 {
   "name": "procbay-schema",
-  "version": "1.0.171",
+  "version": "1.0.174",
   "description": "A set of utilities for managing Prisma database schemas, seeding, and maintenance operations for the Procure-to-Pay system",
   "main": "src/prisma/index.js",
   "type": "module",
-  "exports": {
-    ".": "./src/prisma/index.js",
-    "./src/create-prisma-client.js": "./src/create-prisma-client.js",
-    "./prisma/seeders/seed.js": "./prisma/seeders/seed.js",
-    "./prisma/seeders/utils/seeder-config-mapper.js": "./prisma/seeders/utils/seeder-config-mapper.js"
-  },
   "bin": {
     "prisma-sync": "scripts/sync-schemas.js",
     "prisma-seed": "scripts/seed-databases.js",
     "prisma-truncate": "scripts/truncate-tables.js"
   },
   "files": [
-    "prisma.config.js",
     "prisma/json",
     "prisma/seeders",
     "prisma/migrations",
     "prisma/schema.prisma",
-    "src/generated",
     "src/prisma",
     "src/create-prisma-client.js",
     "package.json",
@@ -29,7 +21,6 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "esbuild": "^0.25.0",
     "@types/bcrypt": "^5.0.2",
     "@types/jest": "^30.0.0",
     "eslint": "^9.30.1",
@@ -37,25 +28,25 @@
     "jest": "^29.7.0",
     "lint-staged": "^16.1.2",
     "prettier": "^3.6.2",
-    "prisma": "^7.8.0"
+    "prisma": "6.8.2"
   },
   "dependencies": {
-    "@prisma/adapter-pg": "^7.8.0",
-    "@prisma/client": "^7.8.0",
+    "@prisma/client": "6.8.2",
     "bcrypt": "^5.1.1",
     "colors": "^1.4.0",
     "dotenv": "^16.4.5",
-    "pg": "^8.16.0",
-    "readline": "^1.3.0",
-    "tsx": "^4.22.0"
+    "readline": "^1.3.0"
+  },
+  "prisma": {
+    "seed": "node prisma/seeders/seed.js"
   },
   "scripts": {
-    "sync-database": "tsx scripts/sync-schemas.js",
-    "seed-database": "tsx scripts/seed-databases.js",
-    "truncate-tables": "tsx scripts/truncate-tables.js",
+    "sync-database": "node scripts/sync-schemas.js",
+    "seed-database": "node scripts/seed-databases.js",
+    "truncate-tables": "node scripts/truncate-tables.js",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "prepack": "node scripts/clean-prisma-artifacts.mjs && prisma generate && node scripts/bundle-prisma-client.mjs && node scripts/verify-package.mjs",
-    "prepare": "node scripts/clean-prisma-artifacts.mjs && prisma generate && node scripts/bundle-prisma-client.mjs",
+    "prepare": "prisma generate && node scripts/fix-prisma-paths.mjs",
+    "prepack": "prisma generate && node scripts/fix-prisma-paths.mjs && node scripts/verify-package.mjs",
     "verify": "node scripts/verify-package.mjs",
     "patch": "npm version patch && npm publish"
   },
@@ -82,7 +73,7 @@
   },
   "homepage": "https://ntgitlab.novatechset.com/procure-2-pay/backend/schema#readme",
   "engines": {
-    "node": ">=20.19.0"
+    "node": ">=16.0.0"
   },
   "publishConfig": {
     "access": "public"

package/prisma/schema.prisma

@@ -5,15 +5,14 @@
 // Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
 
 generator client {
-  provider               = "prisma-client"
-  output                 = "../src/generated/prisma"
-  moduleFormat           = "esm"
-  generatedFileExtension = "ts"
-  importFileExtension    = "ts"
+  provider      = "prisma-client-js"
+  output        = "../src/prisma"
+  binaryTargets = ["native", "windows", "darwin", "debian-openssl-3.0.x"]
 }
 
 datasource db {
   provider = "postgresql"
+  url      = env("DEFAULT_DATABASE_URL")
 }
 
 //---------------------------------- SERIAL NUMBER CONFIGURATION MODEL START ------------------------------------------------

package/scripts/sync-schemas.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { execSync } from "child_process";
 import dotenv from "dotenv";
@@ -216,10 +216,6 @@ const maskDatabaseUrl = (url) => {
 const updatePrismaClientFiles = async () => {
   const spinner = Logger.startSpinner("Updating Prisma client files");
   try {
-    // Prisma ORM v7 generates TypeScript under src/generated/prisma; no path patching needed.
-    spinner.stop(true, "Skipped (Prisma 7 client)");
-    return 0;
-
     const files = ["edge.js", "index.js"];
     let updatedCount = 0;
 

package/src/create-prisma-client.js

@@ -1,40 +1,7 @@
-import { PrismaPg } from "@prisma/adapter-pg";
-import { PrismaClient as BasePrismaClient } from "./generated/prisma/client.bundle.mjs";
+import { PrismaClient as BasePrismaClient } from "./prisma/index.js";
 
 /**
- * Prisma 7 `@prisma/adapter-pg` does not read `?schema=` from the connection URL.
- * Tenant URLs from microservices include `schema=procbay_schema`; pass it explicitly.
- */
-function getPgSchemaFromUrl(urlString) {
-  try {
-    return new URL(urlString).searchParams.get("schema") || undefined;
-  } catch {
-    return undefined;
-  }
-}
-
-function createPgAdapter(connectionString) {
-  const schema = getPgSchemaFromUrl(connectionString);
-  const pgOptions = schema ? { schema } : undefined;
-
-  /** @type {import('pg').PoolConfig} */
-  const poolConfig = { connectionString };
-  if (schema) {
-    // Adapter `schema` fixes prisma.user.findMany() etc.; $queryRaw uses plain SQL
-    // and still resolves unqualified names via connection search_path (not ?schema= URL).
-    poolConfig.options = `-c search_path=${schema}`;
-  }
-
-  return new PrismaPg(poolConfig, pgOptions);
-}
-
-/**
- * Normalize PrismaClient constructor args for Prisma ORM v7 (driver adapter).
- * Strips legacy v6 `datasources` / `datasourceUrl` and builds a `PrismaPg` adapter.
- *
- * @param {string|object} [connectionString]
- * @param {object} [options]
- * @returns {object} Options accepted by the generated PrismaClient
+ * Build PrismaClient options from a connection string and/or legacy v6-style options.
  */
 function buildPrismaClientOptions(connectionString, options = {}) {
   if (
@@ -48,11 +15,7 @@ function buildPrismaClientOptions(connectionString, options = {}) {
 
   const legacyUrl =
     options.datasourceUrl ?? options.datasources?.db?.url;
-  const { datasources, datasourceUrl, adapter, ...prismaOptions } = options;
-
-  if (adapter) {
-    return { adapter, ...prismaOptions };
-  }
+  const { datasources, datasourceUrl, ...prismaOptions } = options;
 
   const url =
     connectionString ?? legacyUrl ?? process.env.DEFAULT_DATABASE_URL;
@@ -64,25 +27,22 @@ function buildPrismaClientOptions(connectionString, options = {}) {
   }
 
   return {
-    adapter: createPgAdapter(url),
+    datasources: {
+      db: { url },
+    },
     ...prismaOptions,
   };
 }
 
 /**
- * Create a PrismaClient for PostgreSQL (Prisma ORM v7 driver adapter).
- * @param {string} [connectionString] - Defaults to DEFAULT_DATABASE_URL
- * @param {object} [options] - PrismaClient options (log, etc.). Legacy v6 `datasources` / `datasourceUrl` are supported.
+ * Create a PrismaClient for PostgreSQL (Prisma ORM v6).
  */
 export function createPrismaClient(connectionString, options = {}) {
-  return new BasePrismaClient(
-    buildPrismaClientOptions(connectionString, options),
-  );
+  return new BasePrismaClient(buildPrismaClientOptions(connectionString, options));
 }
 
 /**
- * PrismaClient with backward-compatible v6 constructor options (`datasources`, `datasourceUrl`).
- * Microservices can keep using `new PrismaClient({ datasources: { db: { url } } })`.
+ * PrismaClient with backward-compatible constructor options (`datasources`, `datasourceUrl`).
  */
 export class PrismaClient extends BasePrismaClient {
   constructor(connectionString, options = {}) {

package/src/prisma/client.d.ts

@@ -0,0 +1 @@
+export * from "./index"

package/src/prisma/client.js

@@ -0,0 +1,4 @@
+
+/* !!! This is code generated by Prisma. Do not edit directly. !!!
+/* eslint-disable */
+module.exports = { ...require('.') }

package/src/prisma/default.d.ts

@@ -0,0 +1 @@
+export * from "./index"

package/src/prisma/default.js

@@ -0,0 +1,4 @@
+
+/* !!! This is code generated by Prisma. Do not edit directly. !!!
+/* eslint-disable */
+module.exports = { ...require('.') }

package/src/prisma/edge.d.ts

@@ -0,0 +1 @@
+export * from "./default"