prisma-arktype 2.1.0 → 2.2.0

package/dist/index.js

@@ -181,17 +181,17 @@ function stringifyEnum(enumData) {
 const processedPlain = [];
 function processPlain(models) {
   for (const model of models) {
-    const stringified = stringifyPlain(model);
-    if (stringified) {
+    const result = stringifyPlain(model);
+    if (result) {
       processedPlain.push({
         name: model.name,
-        stringified
+        stringified: result.stringified,
+        enumDependencies: result.enumDependencies
       });
     }
   }
   Object.freeze(processedPlain);
 }
-const enumMatch$1 = /type\("(.+)"\)/;
 function stringifyPlain(model, isInputCreate = false, isInputUpdate = false) {
   const config = getConfig();
   const { hidden } = extractAnnotations(
@@ -201,6 +201,7 @@ function stringifyPlain(model, isInputCreate = false, isInputUpdate = false) {
     return;
   }
   const fields = [];
+  const enumDependencies = [];
   for (const field of model.fields) {
     const {
       annotations: fieldAnnotations,
@@ -227,17 +228,28 @@ function stringifyPlain(model, isInputCreate = false, isInputUpdate = false) {
     } else if (field.kind === "enum") {
       const enumDef = processedEnums.find((e) => e.name === field.type);
       if (!enumDef) continue;
-      const match = enumDef.stringified.match(enumMatch$1);
-      fieldType = match ? `"${match[1]}"` : `"'${field.type}'"`;
+      if (!enumDependencies.includes(field.type)) {
+        enumDependencies.push(field.type);
+      }
+      fieldType = field.type;
     } else {
       continue;
     }
+    const isEnumType = field.kind === "enum" && !typeOverwrite;
     if (field.isList) {
-      fieldType = `"${wrapPrimitiveWithArray(fieldType.slice(1, -1))}"`;
+      if (isEnumType) {
+        fieldType = `${fieldType}.array()`;
+      } else {
+        fieldType = `"${wrapPrimitiveWithArray(fieldType.slice(1, -1))}"`;
+      }
     }
     if (!field.isRequired) {
-      const inner = fieldType.slice(1, -1);
-      fieldType = `"${inner} | null"`;
+      if (isEnumType) {
+        fieldType = `${fieldType}.or("null")`;
+      } else {
+        const inner = fieldType.slice(1, -1);
+        fieldType = `"${inner} | null"`;
+      }
       fieldName += "?";
     }
     if (field.hasDefaultValue || isInputUpdate) {
@@ -247,9 +259,12 @@ function stringifyPlain(model, isInputCreate = false, isInputUpdate = false) {
     }
     fields.push(`"${fieldName}": ${fieldType}`);
   }
-  return `{
+  return {
+    stringified: `{
   ${fields.join(",\n  ")}
-}`;
+}`,
+    enumDependencies
+  };
 }
 function stringifyPlainInputCreate(model) {
   return stringifyPlain(model, true, false);
@@ -263,11 +278,12 @@ function processCreate(models) {
   for (const model of models) {
     const { hidden } = extractAnnotations(model.documentation);
     if (hidden) continue;
-    const stringified = stringifyPlainInputCreate(model);
-    if (stringified) {
+    const result = stringifyPlainInputCreate(model);
+    if (result) {
       processedCreate.push({
         name: model.name,
-        stringified
+        stringified: result.stringified,
+        enumDependencies: result.enumDependencies
       });
     }
   }
@@ -530,11 +546,12 @@ function processUpdate(models) {
   for (const model of models) {
     const { hidden } = extractAnnotations(model.documentation);
     if (hidden) continue;
-    const stringified = stringifyPlainInputUpdate(model);
-    if (stringified) {
+    const result = stringifyPlainInputUpdate(model);
+    if (result) {
       processedUpdate.push({
         name: model.name,
-        stringified
+        stringified: result.stringified,
+        enumDependencies: result.enumDependencies
       });
     }
   }
@@ -545,25 +562,26 @@ const processedWhere = [];
 const processedWhereUnique = [];
 function processWhere(models) {
   for (const model of models) {
-    const stringified = stringifyWhere(model);
-    if (stringified) {
+    const result = stringifyWhere(model);
+    if (result) {
       processedWhere.push({
         name: model.name,
-        stringified
+        stringified: result.stringified,
+        enumDependencies: result.enumDependencies
       });
     }
-    const stringifiedUnique = stringifyWhereUnique(model);
-    if (stringifiedUnique) {
+    const uniqueResult = stringifyWhereUnique(model);
+    if (uniqueResult) {
       processedWhereUnique.push({
         name: model.name,
-        stringified: stringifiedUnique
+        stringified: uniqueResult.stringified,
+        enumDependencies: uniqueResult.enumDependencies
       });
     }
   }
   Object.freeze(processedWhere);
   Object.freeze(processedWhereUnique);
 }
-const enumMatch = /type\("(.+)"\)/;
 function stringifyWhere(model) {
   const { hidden } = extractAnnotations(
     model.documentation
@@ -572,6 +590,7 @@ function stringifyWhere(model) {
     return;
   }
   const fields = [];
+  const enumDependencies = [];
   for (const field of model.fields) {
     const { annotations: fieldAnnotations, hidden: fieldHidden } = extractAnnotations(field.documentation);
     if (fieldHidden) continue;
@@ -585,20 +604,30 @@ function stringifyWhere(model) {
     } else if (field.kind === "enum") {
       const enumDef = processedEnums.find((e) => e.name === field.type);
       if (!enumDef) continue;
-      const match = enumDef.stringified.match(enumMatch);
-      fieldType = match ? `"${match[1]}"` : `"'${field.type}'"`;
+      if (!enumDependencies.includes(field.type)) {
+        enumDependencies.push(field.type);
+      }
+      fieldType = field.type;
     } else {
       continue;
     }
+    const isEnumType = field.kind === "enum" && !typeOverwrite;
     if (field.isList) {
-      const inner = fieldType.slice(1, -1);
-      fieldType = `"${wrapPrimitiveWithArray(inner)}"`;
+      if (isEnumType) {
+        fieldType = `${fieldType}.array()`;
+      } else {
+        const inner = fieldType.slice(1, -1);
+        fieldType = `"${wrapPrimitiveWithArray(inner)}"`;
+      }
     }
     fields.push(`"${field.name}?": ${fieldType}`);
   }
-  return `{
+  return {
+    stringified: `{
   ${fields.join(",\n  ")}
-}`;
+}`,
+    enumDependencies
+  };
 }
 function stringifyWhereUnique(model) {
   const { hidden } = extractAnnotations(
@@ -608,6 +637,7 @@ function stringifyWhereUnique(model) {
     return;
   }
   const fields = [];
+  const enumDependencies = [];
   for (const field of model.fields) {
     const { annotations: fieldAnnotations, hidden: fieldHidden } = extractAnnotations(field.documentation);
     if (fieldHidden) continue;
@@ -622,8 +652,10 @@ function stringifyWhereUnique(model) {
     } else if (field.kind === "enum") {
       const enumDef = processedEnums.find((e) => e.name === field.type);
       if (!enumDef) continue;
-      const match = enumDef.stringified.match(enumMatch);
-      fieldType = match ? `"${match[1]}"` : `"'${field.type}'"`;
+      if (!enumDependencies.includes(field.type)) {
+        enumDependencies.push(field.type);
+      }
+      fieldType = field.type;
     } else {
       continue;
     }
@@ -632,14 +664,24 @@ function stringifyWhereUnique(model) {
   if (fields.length === 0) {
     return;
   }
-  return `{
+  return {
+    stringified: `{
   ${fields.join(",\n  ")}
-}`;
+}`,
+    enumDependencies
+  };
 }
 
 async function format(input) {
   return input;
 }
+function generateEnumImports(enumDependencies) {
+  if (!enumDependencies || enumDependencies.length === 0) {
+    return "";
+  }
+  return `${enumDependencies.map((enumName) => `import { ${enumName} } from "./${enumName}";`).join("\n")}
+`;
+}
 function mapAllModelsForWrite(processedEnums, processedPlain, processedRelations, processedWhere, processedWhereUnique, processedCreate, processedUpdate, processedRelationsCreate, processedRelationsUpdate, processedSelect, processedInclude, processedOrderBy) {
   const config = getConfig();
   const modelMap = /* @__PURE__ */ new Map();
@@ -652,7 +694,8 @@ function mapAllModelsForWrite(processedEnums, processedPlain, processedRelations
     modelMap.set(model.name, content);
   }
   for (const model of processedPlain) {
-    const content = `${arktypeImport}export const ${model.name}Plain = type(${model.stringified});
+    const enumImports = generateEnumImports(model.enumDependencies);
+    const content = `${arktypeImport}${enumImports}export const ${model.name}Plain = type(${model.stringified});
 `;
     modelMap.set(`${model.name}Plain`, content);
   }
@@ -679,22 +722,26 @@ export const ${plain.name} = ${plain.name}Plain;
     }
   }
   for (const model of processedWhere) {
-    const content = `${arktypeImport}export const ${model.name}Where = type(${model.stringified});
+    const enumImports = generateEnumImports(model.enumDependencies);
+    const content = `${arktypeImport}${enumImports}export const ${model.name}Where = type(${model.stringified});
 `;
     modelMap.set(`${model.name}Where`, content);
   }
   for (const model of processedWhereUnique) {
-    const content = `${arktypeImport}export const ${model.name}WhereUnique = type(${model.stringified});
+    const enumImports = generateEnumImports(model.enumDependencies);
+    const content = `${arktypeImport}${enumImports}export const ${model.name}WhereUnique = type(${model.stringified});
 `;
     modelMap.set(`${model.name}WhereUnique`, content);
   }
   for (const model of processedCreate) {
-    const content = `${arktypeImport}export const ${model.name}Create = type(${model.stringified});
+    const enumImports = generateEnumImports(model.enumDependencies);
+    const content = `${arktypeImport}${enumImports}export const ${model.name}Create = type(${model.stringified});
 `;
     modelMap.set(`${model.name}Create`, content);
   }
   for (const model of processedUpdate) {
-    const content = `${arktypeImport}export const ${model.name}Update = type(${model.stringified});
+    const enumImports = generateEnumImports(model.enumDependencies);
+    const content = `${arktypeImport}${enumImports}export const ${model.name}Update = type(${model.stringified});
 `;
     modelMap.set(`${model.name}Update`, content);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-arktype",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Generate ArkType schemas from your Prisma schema",
   "type": "module",
   "main": "./dist/index.js",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.3.11",
-    "@changesets/cli": "^2.29.7",
+    "@changesets/cli": "2.29.8",
     "@commitlint/cli": "^20.1.0",
     "@commitlint/config-conventional": "^20.0.0",
     "@prisma/client": "^6.18.0",