@cedarjs/internal 4.0.0-canary.13810 → 4.0.0-canary.13812

package/dist/cjs/generate/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/generate/generate.ts"],"names":[],"mappings":";AAWA,eAAO,MAAM,QAAQ;;;;;;EA6CpB,CAAA;AAED,eAAO,MAAM,GAAG,qBAoCf,CAAA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/generate/generate.ts"],"names":[],"mappings":";AAWA,eAAO,MAAM,QAAQ;;;;;;EA2CpB,CAAA;AAED,eAAO,MAAM,GAAG,qBAoCf,CAAA"}

package/dist/cjs/generate/generate.js

@@ -36,7 +36,7 @@ const generate = async () => {
   const { typeDefFiles, errors: generateTypeDefsErrors } = await (0, import_typeDefinitions.generateTypeDefs)();
   const clientPresetFiles = [];
   const { possibleTypesFiles, errors: generatePossibleTypesErrors } = await (0, import_possibleTypes.generatePossibleTypes)();
-  const { files: gqlormFiles, errors: gqlormErrors } = config.experimental?.gqlorm?.enabled ? await (0, import_gqlormSchema.generateGqlormArtifacts)() : { files: [], errors: [] };
+  const { files: gqlormFiles, errors: gqlormErrors } = await (0, import_gqlormSchema.generateGqlormArtifacts)();
   if (config.graphql.trustedDocuments) {
     const preset = await (0, import_clientPreset.generateClientPreset)();
     clientPresetFiles.push(...preset.clientPresetFiles);

package/dist/cjs/generate/gqlormSchema.d.ts

@@ -1,5 +1,14 @@
 import type * as DMMF from '@prisma/dmmf';
 type ModelSchema = Record<string, string[]>;
+interface FrontendFieldInfo {
+    name: string;
+    tsType: string;
+}
+interface FrontendModelInfo {
+    modelName: string;
+    camelName: string;
+    fields: FrontendFieldInfo[];
+}
 export interface BackendFieldInfo {
     name: string;
     graphqlType: string;
@@ -20,6 +29,8 @@ export interface BackendModelInfo {
  * fall back to String.
  */
 export declare function mapDmmfTypeToGraphql(type: string, kind: string): string;
+export declare function buildFrontendModelInfo(dmmf: DMMF.Document): FrontendModelInfo[];
+export declare function generateWebGqlormModelsContent(models: FrontendModelInfo[]): string;
 /**
  * Build a ModelSchema from a Prisma DMMF document.
  *

package/dist/cjs/generate/gqlormSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gqlormSchema.d.ts","sourceRoot":"","sources":["../../../src/generate/gqlormSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,IAAI,MAAM,cAAc,CAAA;AAiBzC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAM3C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,IAAI,EAAE,OAAO,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC;AAqDD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMvE;AAsDD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAkDjE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CA2D7E;AAkBD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA6BvE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,gBAAgB,EAAE,GACzB,MAAM,CA0IR;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC;IACvD,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAC,CA6DD"}
+{"version":3,"file":"gqlormSchema.d.ts","sourceRoot":"","sources":["../../../src/generate/gqlormSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,IAAI,MAAM,cAAc,CAAA;AA8BzC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAE3C,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B;AAMD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,IAAI,EAAE,OAAO,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC;AAqDD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMvE;AAoGD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAClB,iBAAiB,EAAE,CAiDrB;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,iBAAiB,EAAE,GAC1B,MAAM,CA2CR;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAkDjE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CA2D7E;AAkBD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA6BvE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,gBAAgB,EAAE,GACzB,MAAM,CA0IR;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC;IACvD,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAC,CAgFD"}

package/dist/cjs/generate/gqlormSchema.js

@@ -29,9 +29,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var gqlormSchema_exports = {};
 __export(gqlormSchema_exports, {
   buildBackendModelInfo: () => buildBackendModelInfo,
+  buildFrontendModelInfo: () => buildFrontendModelInfo,
   buildModelSchema: () => buildModelSchema,
   generateGqlormArtifacts: () => generateGqlormArtifacts,
   generateGqlormBackendContent: () => generateGqlormBackendContent,
+  generateWebGqlormModelsContent: () => generateWebGqlormModelsContent,
   getExistingSdlTypeNames: () => getExistingSdlTypeNames,
   mapDmmfTypeToGraphql: () => mapDmmfTypeToGraphql
 });
@@ -40,8 +42,21 @@ var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_project_config = require("@cedarjs/project-config");
 var import_cedarPluralize = require("@cedarjs/utils/cedarPluralize");
-const INTERNAL_MODEL_NAMES = /* @__PURE__ */ new Set(["RW_DataMigration"]);
-const SENSITIVE_PATTERNS = ["password", "secret", "token", "hash", "salt"];
+const INTERNAL_MODEL_NAMES = /* @__PURE__ */ new Set([
+  "RW_DataMigration",
+  "Cedar_DataMigration"
+]);
+const SENSITIVE_PATTERNS = [
+  "password",
+  "secret",
+  "token",
+  "hash",
+  "salt",
+  "apikey",
+  "secretkey",
+  "encryptionkey",
+  "privatekey"
+];
 function hasDirective(doc, directive) {
   if (!doc) {
     return false;
@@ -109,6 +124,124 @@ function graphqlTypeToTsInterfaceType(graphqlType, isRequired) {
   }
   return isRequired ? tsType : `${tsType} | null`;
 }
+function dmmfTypeToFrontendTsType(type, kind, isRequired) {
+  let tsType;
+  if (kind === "enum") {
+    tsType = "string";
+  } else {
+    switch (type) {
+      case "String":
+        tsType = "string";
+        break;
+      case "Int":
+      case "Float":
+        tsType = "number";
+        break;
+      case "BigInt":
+        tsType = "bigint";
+        break;
+      case "Boolean":
+        tsType = "boolean";
+        break;
+      case "DateTime":
+        tsType = "string";
+        break;
+      case "Json":
+        tsType = "unknown";
+        break;
+      case "Bytes":
+      case "Decimal":
+        tsType = "string";
+        break;
+      default:
+        tsType = "unknown";
+    }
+  }
+  if (isRequired) {
+    return tsType;
+  }
+  return `${tsType} | null`;
+}
+function buildFrontendModelInfo(dmmf) {
+  const models = [];
+  for (const model of dmmf.datamodel.models) {
+    if (INTERNAL_MODEL_NAMES.has(model.name)) {
+      continue;
+    }
+    if (hasDirective(model.documentation, "hide")) {
+      continue;
+    }
+    const fields = [];
+    for (const field of model.fields) {
+      if (field.kind !== "scalar" && field.kind !== "enum") {
+        continue;
+      }
+      if (hasDirective(field.documentation, "hide")) {
+        continue;
+      }
+      const isShown = hasDirective(field.documentation, "show");
+      if (!isShown && isSensitiveField(field.name)) {
+        continue;
+      }
+      fields.push({
+        name: field.name,
+        tsType: dmmfTypeToFrontendTsType(
+          field.type,
+          field.kind,
+          field.isRequired
+        )
+      });
+    }
+    if (fields.length > 0) {
+      models.push({
+        modelName: model.name,
+        camelName: model.name.charAt(0).toLowerCase() + model.name.slice(1),
+        fields
+      });
+    }
+  }
+  return models;
+}
+function generateWebGqlormModelsContent(models) {
+  if (models.length === 0) {
+    return [
+      "// Auto-generated by Cedar \u2014 do not edit",
+      "// Regenerated on every codegen run. Source: api/db/schema.prisma",
+      "",
+      "declare module '@cedarjs/gqlorm/types/orm' {",
+      "  interface GqlormTypeMap {}",
+      "}",
+      ""
+    ].join("\n");
+  }
+  const lines = [
+    "// Auto-generated by Cedar \u2014 do not edit",
+    "// Regenerated on every codegen run. Source: api/db/schema.prisma",
+    "",
+    "declare namespace GqlormScalar {"
+  ];
+  for (const model of models) {
+    lines.push(`  interface ${model.modelName} {`);
+    for (const field of model.fields) {
+      lines.push(`    ${field.name}: ${field.tsType}`);
+    }
+    lines.push("  }");
+    lines.push("");
+  }
+  lines.push("}");
+  lines.push("");
+  lines.push("declare module '@cedarjs/gqlorm/types/orm' {");
+  lines.push("  interface GqlormTypeMap {");
+  lines.push("    models: {");
+  for (const model of models) {
+    lines.push(`      ${model.camelName}: GqlormScalar.${model.modelName}`);
+  }
+  lines.push("    }");
+  lines.push("  }");
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
+}
 function buildModelSchema(dmmf) {
   const schema = {};
   for (const model of dmmf.datamodel.models) {
@@ -330,27 +463,45 @@ async function generateGqlormArtifacts() {
     const mod = await import("@prisma/internals");
     const { getDMMF } = mod.default || mod;
     const dmmf = await getDMMF({ datamodel: schemas });
+    const paths = (0, import_project_config.getPaths)();
+    const generatedBase = paths.generated.base;
     const modelSchema = buildModelSchema(dmmf);
-    const schemaOutputPath = import_node_path.default.join(
-      (0, import_project_config.getPaths)().generated.base,
-      "gqlorm-schema.json"
+    const frontendModels = buildFrontendModelInfo(dmmf);
+    const schemaOutputPath = import_node_path.default.join(generatedBase, "gqlorm-schema.json");
+    const webTypesOutputPath = import_node_path.default.join(
+      generatedBase,
+      "types",
+      "includes",
+      "web-gqlorm-models.d.ts"
     );
     import_node_fs.default.mkdirSync(import_node_path.default.dirname(schemaOutputPath), { recursive: true });
     import_node_fs.default.writeFileSync(schemaOutputPath, JSON.stringify(modelSchema, null, 2));
     files.push(schemaOutputPath);
-    const graphqlDir = (0, import_project_config.getPaths)().api.graphql;
-    const existingTypes = getExistingSdlTypeNames(graphqlDir);
-    const allModels = buildBackendModelInfo(dmmf);
-    const gqlormModels = allModels.filter(
-      (m) => !existingTypes.has(m.modelName)
+    import_node_fs.default.mkdirSync(import_node_path.default.dirname(webTypesOutputPath), { recursive: true });
+    import_node_fs.default.writeFileSync(
+      webTypesOutputPath,
+      generateWebGqlormModelsContent(frontendModels)
     );
-    const backendOutputDir = import_node_path.default.join((0, import_project_config.getPaths)().generated.base, "gqlorm");
+    files.push(webTypesOutputPath);
+    const backendOutputDir = import_node_path.default.join(generatedBase, "gqlorm");
     const backendOutputPath = import_node_path.default.join(backendOutputDir, "backend.ts");
-    if (gqlormModels.length > 0) {
-      const backendContent = generateGqlormBackendContent(gqlormModels);
-      import_node_fs.default.mkdirSync(backendOutputDir, { recursive: true });
-      import_node_fs.default.writeFileSync(backendOutputPath, backendContent);
-      files.push(backendOutputPath);
+    if ((0, import_project_config.getConfig)().experimental?.gqlorm?.enabled) {
+      const graphqlDir = paths.api.graphql;
+      const existingTypes = getExistingSdlTypeNames(graphqlDir);
+      const allModels = buildBackendModelInfo(dmmf);
+      const gqlormModels = allModels.filter(
+        (m) => !existingTypes.has(m.modelName)
+      );
+      if (gqlormModels.length > 0) {
+        const backendContent = generateGqlormBackendContent(gqlormModels);
+        import_node_fs.default.mkdirSync(backendOutputDir, { recursive: true });
+        import_node_fs.default.writeFileSync(backendOutputPath, backendContent);
+        files.push(backendOutputPath);
+      } else {
+        if (import_node_fs.default.existsSync(backendOutputPath)) {
+          import_node_fs.default.unlinkSync(backendOutputPath);
+        }
+      }
     } else {
       if (import_node_fs.default.existsSync(backendOutputPath)) {
         import_node_fs.default.unlinkSync(backendOutputPath);
@@ -367,9 +518,11 @@ async function generateGqlormArtifacts() {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildBackendModelInfo,
+  buildFrontendModelInfo,
   buildModelSchema,
   generateGqlormArtifacts,
   generateGqlormBackendContent,
+  generateWebGqlormModelsContent,
   getExistingSdlTypeNames,
   mapDmmfTypeToGraphql
 });

package/dist/cjs/generate/watch.js

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var import_node_fs = __toESM(require("node:fs"), 1);
-var import_path = __toESM(require("path"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
 var import_ansis = __toESM(require("ansis"), 1);
 var import_chokidar = __toESM(require("chokidar"), 1);
 var import_project_config = require("@cedarjs/project-config");
@@ -32,18 +32,22 @@ var import_files = require("../files.js");
 var import_routes = require("../routes.js");
 var import_clientPreset = require("./clientPreset.js");
 var import_generate = require("./generate.js");
+var import_gqlormSchema = require("./gqlormSchema.js");
 var import_graphqlCodeGen = require("./graphqlCodeGen.js");
 var import_graphqlSchema = require("./graphqlSchema.js");
 var import_typeDefinitions = require("./typeDefinitions.js");
 const rwjsPaths = (0, import_project_config.getPaths)();
-const generatedDirName = import_path.default.basename(rwjsPaths.generated.base);
-const watcher = import_chokidar.default.watch("(web|api)/src/**/*.{ts,js,jsx,tsx}", {
-  persistent: true,
-  ignored: ["node_modules", generatedDirName],
-  ignoreInitial: true,
-  cwd: rwjsPaths.base,
-  awaitWriteFinish: true
-});
+const generatedDirName = import_node_path.default.basename(rwjsPaths.generated.base);
+const watcher = import_chokidar.default.watch(
+  ["(web|api)/src/**/*.{ts,js,jsx,tsx}", "api/db/**/*.prisma"],
+  {
+    persistent: true,
+    ignored: ["node_modules", generatedDirName],
+    ignoreInitial: true,
+    cwd: rwjsPaths.base,
+    awaitWriteFinish: true
+  }
+);
 const action = {
   add: "Created",
   unlink: "Deleted",
@@ -83,7 +87,7 @@ Created ${files.length} in ${Date.now() - start} ms`);
     return;
   }
   const eventTigger = eventName;
-  const absPath = import_path.default.join(rwjsPaths.base, p);
+  const absPath = import_node_path.default.join(rwjsPaths.base, p);
   const start = Date.now();
   const finished = (type) => import_cliLogger.cliLogger.debug(
     action[eventTigger],
@@ -118,6 +122,9 @@ Created ${files.length} in ${Date.now() - start} ms`);
     await (0, import_graphqlSchema.generateGraphQLSchema)();
     await (0, import_graphqlCodeGen.generateTypeDefGraphQLApi)();
     finished("GraphQL Schema");
+  } else if (absPath.startsWith(import_node_path.default.join(rwjsPaths.base, "api/db/")) && absPath.endsWith(".prisma")) {
+    await (0, import_gqlormSchema.generateGqlormArtifacts)();
+    finished("Prisma Schema");
   }
   if (routesWarningMessage) {
     console.warn(routesWarningMessage);

package/dist/generate/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":";AAWA,eAAO,MAAM,QAAQ;;;;;;EA6CpB,CAAA;AAED,eAAO,MAAM,GAAG,qBAoCf,CAAA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":";AAWA,eAAO,MAAM,QAAQ;;;;;;EA2CpB,CAAA;AAED,eAAO,MAAM,GAAG,qBAoCf,CAAA"}

package/dist/generate/generate.js

@@ -12,7 +12,7 @@ const generate = async () => {
   const { typeDefFiles, errors: generateTypeDefsErrors } = await generateTypeDefs();
   const clientPresetFiles = [];
   const { possibleTypesFiles, errors: generatePossibleTypesErrors } = await generatePossibleTypes();
-  const { files: gqlormFiles, errors: gqlormErrors } = config.experimental?.gqlorm?.enabled ? await generateGqlormArtifacts() : { files: [], errors: [] };
+  const { files: gqlormFiles, errors: gqlormErrors } = await generateGqlormArtifacts();
   if (config.graphql.trustedDocuments) {
     const preset = await generateClientPreset();
     clientPresetFiles.push(...preset.clientPresetFiles);

package/dist/generate/gqlormSchema.d.ts

@@ -1,5 +1,14 @@
 import type * as DMMF from '@prisma/dmmf';
 type ModelSchema = Record<string, string[]>;
+interface FrontendFieldInfo {
+    name: string;
+    tsType: string;
+}
+interface FrontendModelInfo {
+    modelName: string;
+    camelName: string;
+    fields: FrontendFieldInfo[];
+}
 export interface BackendFieldInfo {
     name: string;
     graphqlType: string;
@@ -20,6 +29,8 @@ export interface BackendModelInfo {
  * fall back to String.
  */
 export declare function mapDmmfTypeToGraphql(type: string, kind: string): string;
+export declare function buildFrontendModelInfo(dmmf: DMMF.Document): FrontendModelInfo[];
+export declare function generateWebGqlormModelsContent(models: FrontendModelInfo[]): string;
 /**
  * Build a ModelSchema from a Prisma DMMF document.
  *

package/dist/generate/gqlormSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gqlormSchema.d.ts","sourceRoot":"","sources":["../../src/generate/gqlormSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,IAAI,MAAM,cAAc,CAAA;AAiBzC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAM3C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,IAAI,EAAE,OAAO,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC;AAqDD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMvE;AAsDD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAkDjE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CA2D7E;AAkBD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA6BvE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,gBAAgB,EAAE,GACzB,MAAM,CA0IR;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC;IACvD,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAC,CA6DD"}
+{"version":3,"file":"gqlormSchema.d.ts","sourceRoot":"","sources":["../../src/generate/gqlormSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,IAAI,MAAM,cAAc,CAAA;AA8BzC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAE3C,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B;AAMD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,IAAI,EAAE,OAAO,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC;AAqDD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMvE;AAoGD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAClB,iBAAiB,EAAE,CAiDrB;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,iBAAiB,EAAE,GAC1B,MAAM,CA2CR;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAkDjE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CA2D7E;AAkBD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA6BvE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,gBAAgB,EAAE,GACzB,MAAM,CA0IR;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC;IACvD,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAC,CAgFD"}

package/dist/generate/gqlormSchema.js

@@ -1,9 +1,22 @@
 import fs from "node:fs";
 import path from "node:path";
-import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
+import { getConfig, getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { pluralize } from "@cedarjs/utils/cedarPluralize";
-const INTERNAL_MODEL_NAMES = /* @__PURE__ */ new Set(["RW_DataMigration"]);
-const SENSITIVE_PATTERNS = ["password", "secret", "token", "hash", "salt"];
+const INTERNAL_MODEL_NAMES = /* @__PURE__ */ new Set([
+  "RW_DataMigration",
+  "Cedar_DataMigration"
+]);
+const SENSITIVE_PATTERNS = [
+  "password",
+  "secret",
+  "token",
+  "hash",
+  "salt",
+  "apikey",
+  "secretkey",
+  "encryptionkey",
+  "privatekey"
+];
 function hasDirective(doc, directive) {
   if (!doc) {
     return false;
@@ -71,6 +84,124 @@ function graphqlTypeToTsInterfaceType(graphqlType, isRequired) {
   }
   return isRequired ? tsType : `${tsType} | null`;
 }
+function dmmfTypeToFrontendTsType(type, kind, isRequired) {
+  let tsType;
+  if (kind === "enum") {
+    tsType = "string";
+  } else {
+    switch (type) {
+      case "String":
+        tsType = "string";
+        break;
+      case "Int":
+      case "Float":
+        tsType = "number";
+        break;
+      case "BigInt":
+        tsType = "bigint";
+        break;
+      case "Boolean":
+        tsType = "boolean";
+        break;
+      case "DateTime":
+        tsType = "string";
+        break;
+      case "Json":
+        tsType = "unknown";
+        break;
+      case "Bytes":
+      case "Decimal":
+        tsType = "string";
+        break;
+      default:
+        tsType = "unknown";
+    }
+  }
+  if (isRequired) {
+    return tsType;
+  }
+  return `${tsType} | null`;
+}
+function buildFrontendModelInfo(dmmf) {
+  const models = [];
+  for (const model of dmmf.datamodel.models) {
+    if (INTERNAL_MODEL_NAMES.has(model.name)) {
+      continue;
+    }
+    if (hasDirective(model.documentation, "hide")) {
+      continue;
+    }
+    const fields = [];
+    for (const field of model.fields) {
+      if (field.kind !== "scalar" && field.kind !== "enum") {
+        continue;
+      }
+      if (hasDirective(field.documentation, "hide")) {
+        continue;
+      }
+      const isShown = hasDirective(field.documentation, "show");
+      if (!isShown && isSensitiveField(field.name)) {
+        continue;
+      }
+      fields.push({
+        name: field.name,
+        tsType: dmmfTypeToFrontendTsType(
+          field.type,
+          field.kind,
+          field.isRequired
+        )
+      });
+    }
+    if (fields.length > 0) {
+      models.push({
+        modelName: model.name,
+        camelName: model.name.charAt(0).toLowerCase() + model.name.slice(1),
+        fields
+      });
+    }
+  }
+  return models;
+}
+function generateWebGqlormModelsContent(models) {
+  if (models.length === 0) {
+    return [
+      "// Auto-generated by Cedar \u2014 do not edit",
+      "// Regenerated on every codegen run. Source: api/db/schema.prisma",
+      "",
+      "declare module '@cedarjs/gqlorm/types/orm' {",
+      "  interface GqlormTypeMap {}",
+      "}",
+      ""
+    ].join("\n");
+  }
+  const lines = [
+    "// Auto-generated by Cedar \u2014 do not edit",
+    "// Regenerated on every codegen run. Source: api/db/schema.prisma",
+    "",
+    "declare namespace GqlormScalar {"
+  ];
+  for (const model of models) {
+    lines.push(`  interface ${model.modelName} {`);
+    for (const field of model.fields) {
+      lines.push(`    ${field.name}: ${field.tsType}`);
+    }
+    lines.push("  }");
+    lines.push("");
+  }
+  lines.push("}");
+  lines.push("");
+  lines.push("declare module '@cedarjs/gqlorm/types/orm' {");
+  lines.push("  interface GqlormTypeMap {");
+  lines.push("    models: {");
+  for (const model of models) {
+    lines.push(`      ${model.camelName}: GqlormScalar.${model.modelName}`);
+  }
+  lines.push("    }");
+  lines.push("  }");
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
+}
 function buildModelSchema(dmmf) {
   const schema = {};
   for (const model of dmmf.datamodel.models) {
@@ -292,27 +423,45 @@ async function generateGqlormArtifacts() {
     const mod = await import("@prisma/internals");
     const { getDMMF } = mod.default || mod;
     const dmmf = await getDMMF({ datamodel: schemas });
+    const paths = getPaths();
+    const generatedBase = paths.generated.base;
     const modelSchema = buildModelSchema(dmmf);
-    const schemaOutputPath = path.join(
-      getPaths().generated.base,
-      "gqlorm-schema.json"
+    const frontendModels = buildFrontendModelInfo(dmmf);
+    const schemaOutputPath = path.join(generatedBase, "gqlorm-schema.json");
+    const webTypesOutputPath = path.join(
+      generatedBase,
+      "types",
+      "includes",
+      "web-gqlorm-models.d.ts"
     );
     fs.mkdirSync(path.dirname(schemaOutputPath), { recursive: true });
     fs.writeFileSync(schemaOutputPath, JSON.stringify(modelSchema, null, 2));
     files.push(schemaOutputPath);
-    const graphqlDir = getPaths().api.graphql;
-    const existingTypes = getExistingSdlTypeNames(graphqlDir);
-    const allModels = buildBackendModelInfo(dmmf);
-    const gqlormModels = allModels.filter(
-      (m) => !existingTypes.has(m.modelName)
+    fs.mkdirSync(path.dirname(webTypesOutputPath), { recursive: true });
+    fs.writeFileSync(
+      webTypesOutputPath,
+      generateWebGqlormModelsContent(frontendModels)
     );
-    const backendOutputDir = path.join(getPaths().generated.base, "gqlorm");
+    files.push(webTypesOutputPath);
+    const backendOutputDir = path.join(generatedBase, "gqlorm");
     const backendOutputPath = path.join(backendOutputDir, "backend.ts");
-    if (gqlormModels.length > 0) {
-      const backendContent = generateGqlormBackendContent(gqlormModels);
-      fs.mkdirSync(backendOutputDir, { recursive: true });
-      fs.writeFileSync(backendOutputPath, backendContent);
-      files.push(backendOutputPath);
+    if (getConfig().experimental?.gqlorm?.enabled) {
+      const graphqlDir = paths.api.graphql;
+      const existingTypes = getExistingSdlTypeNames(graphqlDir);
+      const allModels = buildBackendModelInfo(dmmf);
+      const gqlormModels = allModels.filter(
+        (m) => !existingTypes.has(m.modelName)
+      );
+      if (gqlormModels.length > 0) {
+        const backendContent = generateGqlormBackendContent(gqlormModels);
+        fs.mkdirSync(backendOutputDir, { recursive: true });
+        fs.writeFileSync(backendOutputPath, backendContent);
+        files.push(backendOutputPath);
+      } else {
+        if (fs.existsSync(backendOutputPath)) {
+          fs.unlinkSync(backendOutputPath);
+        }
+      }
     } else {
       if (fs.existsSync(backendOutputPath)) {
         fs.unlinkSync(backendOutputPath);
@@ -328,9 +477,11 @@ async function generateGqlormArtifacts() {
 }
 export {
   buildBackendModelInfo,
+  buildFrontendModelInfo,
   buildModelSchema,
   generateGqlormArtifacts,
   generateGqlormBackendContent,
+  generateWebGqlormModelsContent,
   getExistingSdlTypeNames,
   mapDmmfTypeToGraphql
 };

package/dist/generate/watch.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
 import ansis from "ansis";
 import chokidar from "chokidar";
 import { getPaths } from "@cedarjs/project-config";
@@ -14,6 +14,7 @@ import {
 import { warningForDuplicateRoutes } from "../routes.js";
 import { generateClientPreset } from "./clientPreset.js";
 import { generate } from "./generate.js";
+import { generateGqlormArtifacts } from "./gqlormSchema.js";
 import {
   generateTypeDefGraphQLApi,
   generateTypeDefGraphQLWeb
@@ -29,13 +30,16 @@ import {
 } from "./typeDefinitions.js";
 const rwjsPaths = getPaths();
 const generatedDirName = path.basename(rwjsPaths.generated.base);
-const watcher = chokidar.watch("(web|api)/src/**/*.{ts,js,jsx,tsx}", {
-  persistent: true,
-  ignored: ["node_modules", generatedDirName],
-  ignoreInitial: true,
-  cwd: rwjsPaths.base,
-  awaitWriteFinish: true
-});
+const watcher = chokidar.watch(
+  ["(web|api)/src/**/*.{ts,js,jsx,tsx}", "api/db/**/*.prisma"],
+  {
+    persistent: true,
+    ignored: ["node_modules", generatedDirName],
+    ignoreInitial: true,
+    cwd: rwjsPaths.base,
+    awaitWriteFinish: true
+  }
+);
 const action = {
   add: "Created",
   unlink: "Deleted",
@@ -110,6 +114,9 @@ Created ${files.length} in ${Date.now() - start} ms`);
     await generateGraphQLSchema();
     await generateTypeDefGraphQLApi();
     finished("GraphQL Schema");
+  } else if (absPath.startsWith(path.join(rwjsPaths.base, "api/db/")) && absPath.endsWith(".prisma")) {
+    await generateGqlormArtifacts();
+    finished("Prisma Schema");
   }
   if (routesWarningMessage) {
     console.warn(routesWarningMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "4.0.0-canary.13810+aff439035d",
+  "version": "4.0.0-canary.13812+d9fd5099d9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -159,13 +159,13 @@
     "@babel/plugin-transform-react-jsx": "7.28.6",
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/babel-config": "4.0.0-canary.13810",
-    "@cedarjs/cli-helpers": "4.0.0-canary.13810",
-    "@cedarjs/graphql-server": "4.0.0-canary.13810",
-    "@cedarjs/project-config": "4.0.0-canary.13810",
-    "@cedarjs/router": "4.0.0-canary.13810",
-    "@cedarjs/structure": "4.0.0-canary.13810",
-    "@cedarjs/utils": "4.0.0-canary.13810",
+    "@cedarjs/babel-config": "4.0.0-canary.13812",
+    "@cedarjs/cli-helpers": "4.0.0-canary.13812",
+    "@cedarjs/graphql-server": "4.0.0-canary.13812",
+    "@cedarjs/project-config": "4.0.0-canary.13812",
+    "@cedarjs/router": "4.0.0-canary.13812",
+    "@cedarjs/structure": "4.0.0-canary.13812",
+    "@cedarjs/utils": "4.0.0-canary.13812",
     "@graphql-codegen/add": "6.0.0",
     "@graphql-codegen/cli": "6.2.1",
     "@graphql-codegen/client-preset": "5.2.4",
@@ -198,7 +198,7 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.2",
-    "@cedarjs/framework-tools": "4.0.0-canary.13810",
+    "@cedarjs/framework-tools": "4.0.0-canary.13812",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.18",
@@ -211,5 +211,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "aff439035df7d99cfefe30e24200c46bd9ab83c6"
+  "gitHead": "d9fd5099d9b7219062f7334f43c31ae617f88d34"
 }