@msbci/form-server 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msbci/form-server",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Form server — REST API with Prisma, multi-tenant, multi-database",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -21,20 +21,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "@prisma/client": "^6.2.0",
-    "zod": "^3.24.0",
-    "@msbci/form-core": "1.3.0"
-  },
-  "devDependencies": {
-    "prisma": "^6.2.0",
-    "tsup": "^8.3.0",
-    "vitest": "^2.1.0",
-    "@vitest/coverage-v8": "^2.1.0",
-    "typescript": "^5.7.0"
-  },
-  "sideEffects": false,
-  "license": "SEE LICENSE IN LICENSE.md",
   "scripts": {
     "prisma:generate": "prisma generate --schema=src/prisma/schema.prisma",
     "prisma:sync": "prisma db push --schema=src/prisma/schema.prisma --skip-generate --accept-data-loss",
@@ -52,5 +38,20 @@
     "db:generate": "prisma generate --schema=src/prisma/schema.prisma",
     "db:migrate": "prisma migrate dev --schema=src/prisma/schema.prisma",
     "db:push": "prisma db push --schema=src/prisma/schema.prisma"
-  }
-}
+  },
+  "dependencies": {
+    "@msbci/form-core": "workspace:*",
+    "@prisma/client": "^6.2.0",
+    "zod": "^3.24.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@vitest/coverage-v8": "^2.1.0",
+    "prisma": "^6.2.0",
+    "tsup": "^8.3.0",
+    "typescript": "^5.7.0",
+    "vitest": "^2.1.0"
+  },
+  "sideEffects": false,
+  "license": "SEE LICENSE IN LICENSE.md"
+}

package/src/prisma/schema.prisma

@@ -40,25 +40,38 @@ model FormDefinition {
   isPublished Boolean  @default(false)
   tenantId    String?
   formTypeId  String?
-  scopeId     String?
   metadata    String?  // JSON
   createdAt   DateTime @default(now())
   updatedAt   DateTime @updatedAt
   createdBy   String?
   updatedBy   String?
 
-  formType    FormType?        @relation(fields: [formTypeId], references: [id])
-  scope       Scope?           @relation(fields: [scopeId], references: [id])
+  formType    FormType?              @relation(fields: [formTypeId], references: [id])
+  scopes      FormDefinitionScope[]
   pages       FormPage[]
   submissions FormSubmission[]
 
   @@unique([code, version, tenantId])
   @@index([tenantId])
   @@index([formTypeId])
-  @@index([scopeId])
   @@map("form_definitions")
 }
 
+// Pivot table — one form can reference many scopes (priority = order).
+model FormDefinitionScope {
+  formId  String
+  scopeId String
+  order   Int    @default(0)
+
+  form  FormDefinition @relation(fields: [formId], references: [id], onDelete: Cascade)
+  scope Scope          @relation(fields: [scopeId], references: [id], onDelete: Cascade)
+
+  @@id([formId, scopeId])
+  @@index([formId, order])
+  @@index([scopeId])
+  @@map("form_definition_scopes")
+}
+
 // ─── Form Page (navigation unit) ──────────────────────────
 
 model FormPage {
@@ -166,19 +179,50 @@ model Scope {
   description String?  // JSON LocalizedString or plain string
   tenantId    String   @default("default")
   metadata    String?  // JSON
+  // Encrypted scope-level headers shared by all DataSourceConfig in the
+  // scope. Format produced by utils/encryption.ts. NULL when unset.
+  headers     String?
   createdAt   DateTime @default(now())
   updatedAt   DateTime @updatedAt
   createdBy   String?
   updatedBy   String?
 
-  forms     FormDefinition[]
-  templates VariableTemplate[]
+  forms       FormDefinitionScope[]
+  templates   VariableTemplate[]
+  dataSources DataSourceConfig[]
 
   @@unique([code, tenantId])
   @@index([tenantId])
   @@map("scopes")
 }
 
+// ─── Data Source Config (admin-managed REST sources) ──────
+
+model DataSourceConfig {
+  id              String   @id @default(cuid())
+  code            String
+  name            String   // JSON LocalizedString
+  scopeId         String
+  url             String
+  method          String   @default("GET")
+  queryParam      String?  @default("q")
+  valueField      String
+  labelField      String
+  headersOverride String?  // JSON encrypted (utils/encryption.ts)
+  dependencies    String?  // JSON Record<string,string> (urlParam → varCode)
+  metadata        String?  // JSON
+  createdAt       DateTime @default(now())
+  updatedAt       DateTime @updatedAt
+  createdBy       String?
+  updatedBy       String?
+
+  scope Scope @relation(fields: [scopeId], references: [id], onDelete: Cascade)
+
+  @@unique([code, scopeId])
+  @@index([scopeId])
+  @@map("data_source_configs")
+}
+
 // ─── Variable Template ────────────────────────────────────
 
 model VariableTemplate {