@msbci/form-server 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msbci/form-server",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Form server — REST API with Prisma, multi-tenant, multi-database",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -21,6 +21,21 @@
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "@prisma/client": "^6.2.0",
+    "zod": "^3.24.0",
+    "@msbci/form-core": "1.3.3"
+  },
+  "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",
   "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",
@@ -38,20 +53,5 @@
     "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

@@ -1,286 +1,286 @@
-// @msbci/form-server — Prisma schema
-// Supports PostgreSQL and SQLite providers
-// Hierarchy: FormDefinition → FormPage[] → (FormVariable[] + FormRoster[])
-//            FormRoster → FormVariable[] (via rosterId FK, NOT parentId)
-
-generator client {
-  provider = "prisma-client-js"
-  output   = "../../generated/prisma"
-}
-
-datasource db {
-  provider = "sqlite"
-  url      = env("DATABASE_URL")
-}
-
-// ─── Form Type Classification ─────────────────────────────
-
-model FormType {
-  id          String   @id @default(cuid())
-  code        String   @unique
-  name        String
-  description String?
-  metadata    String?  // JSON
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-
-  forms FormDefinition[]
-
-  @@map("form_types")
-}
-
-// ─── Form Definition ──────────────────────────────────────
-
-model FormDefinition {
-  id          String   @id @default(cuid())
-  code        String
-  name        String
-  description String?
-  version     String   @default("1.0.0")
-  isPublished Boolean  @default(false)
-  tenantId    String?
-  formTypeId  String?
-  metadata    String?  // JSON
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-  createdBy   String?
-  updatedBy   String?
-
-  formType    FormType?              @relation(fields: [formTypeId], references: [id])
-  scopes      FormDefinitionScope[]
-  pages       FormPage[]
-  submissions FormSubmission[]
-
-  @@unique([code, version, tenantId])
-  @@index([tenantId])
-  @@index([formTypeId])
-  @@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 {
-  id                   String   @id @default(cuid())
-  code                 String
-  name                 String
-  order                Int
-  isRepeatable         Boolean  @default(false)
-  repeatMinInstances   Int?
-  repeatMaxInstances   Int?
-  repeatControlVarCode String?
-  repeatInstanceLabel  String?
-  conditions           String?  // JSON: IConditionRule[]
-  metadata             String?  // JSON
-  createdAt            DateTime @default(now())
-  updatedAt            DateTime @updatedAt
-
-  formId    String
-  form      FormDefinition @relation(fields: [formId], references: [id], onDelete: Cascade)
-
-  // Composition: a page owns variables AND rosters
-  variables FormVariable[] @relation("PageVariables")
-  rosters   FormRoster[]
-
-  @@unique([formId, code])
-  @@index([formId])
-  @@map("form_pages")
-}
-
-// ─── Form Roster (sub-component of a page) ────────────────
-
-model FormRoster {
-  id                String   @id @default(cuid())
-  code              String
-  name              String
-  rosterType        String   // 'check' | 'list' | 'collection' | 'collection_extend'
-  order             Int
-  pilotVariableCode String?
-  options           String?  // JSON: IVariableOption[]
-  conditions        String?  // JSON: IConditionRule[]
-  metadata          String?  // JSON
-  createdAt         DateTime @default(now())
-  updatedAt         DateTime @updatedAt
-
-  pageId String
-  page   FormPage @relation(fields: [pageId], references: [id], onDelete: Cascade)
-
-  // Composition: a roster owns its variables
-  variables FormVariable[] @relation("RosterVariables")
-
-  @@unique([pageId, code])
-  @@index([pageId])
-  @@map("form_rosters")
-}
-
-// ─── Form Variable (field) ────────────────────────────────
-
-model FormVariable {
-  id                      String   @id @default(cuid())
-  code                    String
-  name                    String
-  type                    String   // VariableType enum as string
-  order                   Int
-  isRequired              Boolean  @default(false)
-  isReadonly              Boolean  @default(false)
-  isHidden                Boolean  @default(false)
-  defaultValue            String?
-  placeholder             String?
-  description             String?
-  options                 String?  // JSON: IVariableOption[]
-  validationRules         String?  // JSON: IValidationRule[]
-  conditions              String?  // JSON: IConditionRule[]
-  expression              String?  // For calculated fields
-  dataSourceId            String?
-  dataSourceDependencies  String?  // JSON: Record<string, string>
-  style                   String?  // JSON: IComponentStyle
-  metadata                String?  // JSON
-  createdAt               DateTime @default(now())
-  updatedAt               DateTime @updatedAt
-
-  // A variable belongs to EITHER a page or a roster (not both)
-  pageId   String?
-  page     FormPage?   @relation("PageVariables", fields: [pageId], references: [id], onDelete: Cascade)
-  rosterId String?
-  roster   FormRoster? @relation("RosterVariables", fields: [rosterId], references: [id], onDelete: Cascade)
-
-  // Optional link to a reusable VariableTemplate (Option B — resolved
-  // in-memory at load time). Local overrides live in `templateOverrides`.
-  templateId        String?
-  template          VariableTemplate? @relation(fields: [templateId], references: [id])
-  templateOverrides String?  // JSON: Partial<IVariableTemplateOverrides>
-
-  @@index([pageId])
-  @@index([rosterId])
-  @@index([templateId])
-  @@map("form_variables")
-}
-
-// ─── Scope ────────────────────────────────────────────────
-
-model Scope {
-  id          String   @id @default(cuid())
-  code        String
-  name        String   // JSON LocalizedString or plain string
-  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       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 {
-  id          String   @id @default(cuid())
-  code        String
-  name        String   // JSON LocalizedString or plain string
-  scopeId     String
-  tenantId    String   @default("default")
-
-  // Overridable fields (mirrors IFormVariable, minus instance-only ones)
-  variableType           String
-  description            String?  // JSON LocalizedString or plain string
-  placeholder            String?  // JSON LocalizedString or plain string
-  isRequired             Boolean  @default(false)
-  isReadonly             Boolean  @default(false)
-  isHidden               Boolean  @default(false)
-  options                String?  // JSON: IVariableOption[]
-  validationRules        String?  // JSON: IValidationRule[]
-  conditions             String?  // JSON: IConditionRule[]
-  expression             String?
-  dataSourceId           String?
-  dataSourceDependencies String?  // JSON: Record<string, string>
-  style                  String?  // JSON: IComponentStyle
-  metadata               String?  // JSON
-
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  createdBy String?
-  updatedBy String?
-
-  scope     Scope          @relation(fields: [scopeId], references: [id])
-  variables FormVariable[]
-
-  @@unique([code, scopeId])
-  @@index([scopeId])
-  @@index([tenantId])
-  @@map("variable_templates")
-}
-
-// ─── Form Submission ──────────────────────────────────────
-
-model FormSubmission {
-  id          String   @id @default(cuid())
-  formId      String
-  tenantId    String?
-  status      String   @default("draft") // draft, submitted, approved, rejected, completed
-  data        String   // JSON: Record<string, IFieldResponse>
-  submittedBy String?
-  metadata    String?  // JSON
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-  createdBy   String?
-  updatedBy   String?
-
-  form FormDefinition @relation(fields: [formId], references: [id], onDelete: Cascade)
-
-  @@index([formId])
-  @@index([tenantId])
-  @@index([status])
-  @@map("form_submissions")
-}
+// @msbci/form-server — Prisma schema
+// Supports PostgreSQL and SQLite providers
+// Hierarchy: FormDefinition → FormPage[] → (FormVariable[] + FormRoster[])
+//            FormRoster → FormVariable[] (via rosterId FK, NOT parentId)
+
+generator client {
+  provider = "prisma-client-js"
+  output   = "../../generated/prisma"
+}
+
+datasource db {
+  provider = "sqlite"
+  url      = env("DATABASE_URL")
+}
+
+// ─── Form Type Classification ─────────────────────────────
+
+model FormType {
+  id          String   @id @default(cuid())
+  code        String   @unique
+  name        String
+  description String?
+  metadata    String?  // JSON
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+
+  forms FormDefinition[]
+
+  @@map("form_types")
+}
+
+// ─── Form Definition ──────────────────────────────────────
+
+model FormDefinition {
+  id          String   @id @default(cuid())
+  code        String
+  name        String
+  description String?
+  version     String   @default("1.0.0")
+  isPublished Boolean  @default(false)
+  tenantId    String?
+  formTypeId  String?
+  metadata    String?  // JSON
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+  createdBy   String?
+  updatedBy   String?
+
+  formType    FormType?              @relation(fields: [formTypeId], references: [id])
+  scopes      FormDefinitionScope[]
+  pages       FormPage[]
+  submissions FormSubmission[]
+
+  @@unique([code, version, tenantId])
+  @@index([tenantId])
+  @@index([formTypeId])
+  @@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 {
+  id                   String   @id @default(cuid())
+  code                 String
+  name                 String
+  order                Int
+  isRepeatable         Boolean  @default(false)
+  repeatMinInstances   Int?
+  repeatMaxInstances   Int?
+  repeatControlVarCode String?
+  repeatInstanceLabel  String?
+  conditions           String?  // JSON: IConditionRule[]
+  metadata             String?  // JSON
+  createdAt            DateTime @default(now())
+  updatedAt            DateTime @updatedAt
+
+  formId    String
+  form      FormDefinition @relation(fields: [formId], references: [id], onDelete: Cascade)
+
+  // Composition: a page owns variables AND rosters
+  variables FormVariable[] @relation("PageVariables")
+  rosters   FormRoster[]
+
+  @@unique([formId, code])
+  @@index([formId])
+  @@map("form_pages")
+}
+
+// ─── Form Roster (sub-component of a page) ────────────────
+
+model FormRoster {
+  id                String   @id @default(cuid())
+  code              String
+  name              String
+  rosterType        String   // 'check' | 'list' | 'collection' | 'collection_extend'
+  order             Int
+  pilotVariableCode String?
+  options           String?  // JSON: IVariableOption[]
+  conditions        String?  // JSON: IConditionRule[]
+  metadata          String?  // JSON
+  createdAt         DateTime @default(now())
+  updatedAt         DateTime @updatedAt
+
+  pageId String
+  page   FormPage @relation(fields: [pageId], references: [id], onDelete: Cascade)
+
+  // Composition: a roster owns its variables
+  variables FormVariable[] @relation("RosterVariables")
+
+  @@unique([pageId, code])
+  @@index([pageId])
+  @@map("form_rosters")
+}
+
+// ─── Form Variable (field) ────────────────────────────────
+
+model FormVariable {
+  id                      String   @id @default(cuid())
+  code                    String
+  name                    String
+  type                    String   // VariableType enum as string
+  order                   Int
+  isRequired              Boolean  @default(false)
+  isReadonly              Boolean  @default(false)
+  isHidden                Boolean  @default(false)
+  defaultValue            String?
+  placeholder             String?
+  description             String?
+  options                 String?  // JSON: IVariableOption[]
+  validationRules         String?  // JSON: IValidationRule[]
+  conditions              String?  // JSON: IConditionRule[]
+  expression              String?  // For calculated fields
+  dataSourceId            String?
+  dataSourceDependencies  String?  // JSON: Record<string, string>
+  style                   String?  // JSON: IComponentStyle
+  metadata                String?  // JSON
+  createdAt               DateTime @default(now())
+  updatedAt               DateTime @updatedAt
+
+  // A variable belongs to EITHER a page or a roster (not both)
+  pageId   String?
+  page     FormPage?   @relation("PageVariables", fields: [pageId], references: [id], onDelete: Cascade)
+  rosterId String?
+  roster   FormRoster? @relation("RosterVariables", fields: [rosterId], references: [id], onDelete: Cascade)
+
+  // Optional link to a reusable VariableTemplate (Option B — resolved
+  // in-memory at load time). Local overrides live in `templateOverrides`.
+  templateId        String?
+  template          VariableTemplate? @relation(fields: [templateId], references: [id])
+  templateOverrides String?  // JSON: Partial<IVariableTemplateOverrides>
+
+  @@index([pageId])
+  @@index([rosterId])
+  @@index([templateId])
+  @@map("form_variables")
+}
+
+// ─── Scope ────────────────────────────────────────────────
+
+model Scope {
+  id          String   @id @default(cuid())
+  code        String
+  name        String   // JSON LocalizedString or plain string
+  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       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 {
+  id          String   @id @default(cuid())
+  code        String
+  name        String   // JSON LocalizedString or plain string
+  scopeId     String
+  tenantId    String   @default("default")
+
+  // Overridable fields (mirrors IFormVariable, minus instance-only ones)
+  variableType           String
+  description            String?  // JSON LocalizedString or plain string
+  placeholder            String?  // JSON LocalizedString or plain string
+  isRequired             Boolean  @default(false)
+  isReadonly             Boolean  @default(false)
+  isHidden               Boolean  @default(false)
+  options                String?  // JSON: IVariableOption[]
+  validationRules        String?  // JSON: IValidationRule[]
+  conditions             String?  // JSON: IConditionRule[]
+  expression             String?
+  dataSourceId           String?
+  dataSourceDependencies String?  // JSON: Record<string, string>
+  style                  String?  // JSON: IComponentStyle
+  metadata               String?  // JSON
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  createdBy String?
+  updatedBy String?
+
+  scope     Scope          @relation(fields: [scopeId], references: [id])
+  variables FormVariable[]
+
+  @@unique([code, scopeId])
+  @@index([scopeId])
+  @@index([tenantId])
+  @@map("variable_templates")
+}
+
+// ─── Form Submission ──────────────────────────────────────
+
+model FormSubmission {
+  id          String   @id @default(cuid())
+  formId      String
+  tenantId    String?
+  status      String   @default("draft") // draft, submitted, approved, rejected, completed
+  data        String   // JSON: Record<string, IFieldResponse>
+  submittedBy String?
+  metadata    String?  // JSON
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+  createdBy   String?
+  updatedBy   String?
+
+  form FormDefinition @relation(fields: [formId], references: [id], onDelete: Cascade)
+
+  @@index([formId])
+  @@index([tenantId])
+  @@index([status])
+  @@map("form_submissions")
+}