@cedarjs/internal 5.0.7-next.338 → 5.0.7-rc.3

package/dist/cjs/ts2js.js

@@ -0,0 +1,159 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ts2js_exports = {};
+__export(ts2js_exports, {
+  convertTsFilesToJs: () => convertTsFilesToJs,
+  convertTsProjectToJs: () => convertTsProjectToJs,
+  convertTsScriptsToJs: () => convertTsScriptsToJs,
+  getPrettierConfig: () => getPrettierConfig,
+  prettify: () => prettify,
+  transformTSToJS: () => transformTSToJS,
+  typeScriptSourceFiles: () => typeScriptSourceFiles
+});
+module.exports = __toCommonJS(ts2js_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_path = __toESM(require("path"), 1);
+var import_core = require("@babel/core");
+var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_prettier = require("prettier");
+var import_project_config = require("@cedarjs/project-config");
+const convertTsProjectToJs = (cwd = (0, import_project_config.getPaths)().base) => {
+  const files = typeScriptSourceFiles(cwd);
+  convertTsFilesToJs(cwd, files);
+};
+const convertTsScriptsToJs = (cwd = (0, import_project_config.getPaths)().base) => {
+  const files = typeScriptSourceFiles(cwd, "scripts/*.{ts,tsx}");
+  convertTsFilesToJs(cwd, files);
+};
+const convertTsFilesToJs = async (cwd, files) => {
+  if (files.length === 0) {
+    console.log("No TypeScript files found to convert to JS in this project.");
+  }
+  for (const f of files) {
+    const code = await transformTSToJS(f);
+    if (code) {
+      import_node_fs.default.writeFileSync(
+        import_path.default.join(cwd, f.replace(".tsx", ".jsx").replace(".ts", ".js")),
+        code,
+        "utf8"
+      );
+      import_node_fs.default.unlinkSync(import_path.default.join(cwd, f));
+    }
+  }
+  if (import_node_fs.default.existsSync(import_path.default.join(cwd, "api/tsconfig.json"))) {
+    import_node_fs.default.renameSync(
+      import_path.default.join(cwd, "api/tsconfig.json"),
+      import_path.default.join(cwd, "api/jsconfig.json")
+    );
+  }
+  if (import_node_fs.default.existsSync(import_path.default.join(cwd, "web/tsconfig.json"))) {
+    import_node_fs.default.renameSync(
+      import_path.default.join(cwd, "web/tsconfig.json"),
+      import_path.default.join(cwd, "web/jsconfig.json")
+    );
+  }
+  if (import_node_fs.default.existsSync(import_path.default.join(cwd, "scripts/tsconfig.json"))) {
+    import_node_fs.default.renameSync(
+      import_path.default.join(cwd, "scripts/tsconfig.json"),
+      import_path.default.join(cwd, "scripts/jsconfig.json")
+    );
+  }
+};
+const typeScriptSourceFiles = (cwd, globPattern = "{api,web}/src/**/*.{ts,tsx}") => {
+  console.log(globPattern);
+  return import_fast_glob.default.sync(globPattern, {
+    cwd,
+    ignore: ["node_modules"]
+  });
+};
+const transformTSToJS = (file) => {
+  const tsCode = import_node_fs.default.readFileSync(file, "utf8");
+  const filename = import_path.default.basename(file);
+  const result = (0, import_core.transform)(tsCode, {
+    filename,
+    cwd: (0, import_project_config.getPaths)().base,
+    configFile: false,
+    plugins: [
+      [
+        "@babel/plugin-transform-typescript",
+        {
+          isTSX: true,
+          allExtensions: true
+        }
+      ]
+    ],
+    retainLines: true
+  });
+  if (!result?.code) {
+    return void 0;
+  }
+  return prettify(result.code, filename.replace(/\.ts$/, ".js"));
+};
+const getPrettierConfig = async () => {
+  try {
+    const { default: prettierConfig } = await import(`file://${import_path.default.join((0, import_project_config.getPaths)().base, "prettier.config.cjs")}`);
+    return prettierConfig;
+  } catch {
+    return void 0;
+  }
+};
+const prettierParser = (filename) => {
+  switch (import_path.default.extname(filename.replace(".template", ""))) {
+    case ".css":
+      return "css";
+    case ".js":
+      return "babel";
+    case ".ts":
+    case ".tsx":
+      return "babel-ts";
+    default:
+      return void 0;
+  }
+};
+const prettify = async (code, filename) => {
+  const parser = prettierParser(filename);
+  if (typeof parser === "undefined") {
+    return code;
+  }
+  const prettierConfig = await getPrettierConfig();
+  return (0, import_prettier.format)(code, {
+    ...prettierConfig,
+    parser
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  convertTsFilesToJs,
+  convertTsProjectToJs,
+  convertTsScriptsToJs,
+  getPrettierConfig,
+  prettify,
+  transformTSToJS,
+  typeScriptSourceFiles
+});

package/dist/cjs/validateSchema.d.ts

@@ -0,0 +1,14 @@
+import type { DocumentNode } from 'graphql';
+export declare const DIRECTIVE_REQUIRED_ERROR_MESSAGE = "You must specify one of @requireAuth, @skipAuth or a custom directive";
+export declare const DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE = "Please check that the requireAuth roles is a string or an array of strings.";
+/**
+ * These are names that are commonly used in GraphQL schemas as scalars
+ * and would cause a conflict if used as a type name.
+ *
+ * Note: Query, Mutation, and Subscription are not included here because
+ * they are checked for separately.
+ */
+export declare const RESERVED_TYPES: string[];
+export declare function validateSchema(schemaDocumentNode: DocumentNode, typesToCheck?: string[]): void;
+export declare const loadAndValidateSdls: () => Promise<void>;
+//# sourceMappingURL=validateSchema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validateSchema.d.ts","sourceRoot":"","sources":["../../src/validateSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAA4B,MAAM,SAAS,CAAA;AAQrE,eAAO,MAAM,gCAAgC,0EAC4B,CAAA;AAEzE,eAAO,MAAM,0CAA0C,gFACwB,CAAA;AAE/E;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,UAS1B,CAAA;AAED,wBAAgB,cAAc,CAC5B,kBAAkB,EAAE,YAAY,EAChC,YAAY,GAAE,MAAM,EAA0B,QAwI/C;AAED,eAAO,MAAM,mBAAmB,qBAkC/B,CAAA"}

package/dist/cjs/validateSchema.js

@@ -0,0 +1,195 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var validateSchema_exports = {};
+__export(validateSchema_exports, {
+  DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE: () => DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE,
+  DIRECTIVE_REQUIRED_ERROR_MESSAGE: () => DIRECTIVE_REQUIRED_ERROR_MESSAGE,
+  RESERVED_TYPES: () => RESERVED_TYPES,
+  loadAndValidateSdls: () => loadAndValidateSdls,
+  validateSchema: () => validateSchema
+});
+module.exports = __toCommonJS(validateSchema_exports);
+var import_code_file_loader = require("@graphql-tools/code-file-loader");
+var import_load = require("@graphql-tools/load");
+var import_merge = require("@graphql-tools/merge");
+var import_graphql = require("graphql");
+var import_graphql_server = require("@cedarjs/graphql-server");
+var import_project_config = require("@cedarjs/project-config");
+var import_project = require("./project.js");
+const DIRECTIVE_REQUIRED_ERROR_MESSAGE = "You must specify one of @requireAuth, @skipAuth or a custom directive";
+const DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE = "Please check that the requireAuth roles is a string or an array of strings.";
+const RESERVED_TYPES = [
+  "Int",
+  "Float",
+  "Boolean",
+  "String",
+  "DateTime",
+  "ID",
+  "uid",
+  "as"
+];
+function validateSchema(schemaDocumentNode, typesToCheck = ["Query", "Mutation"]) {
+  const validationOutput = [];
+  const reservedNameValidationOutput = [];
+  const directiveRoleValidationOutput = [];
+  if ((0, import_project.isServerFileSetup)() && (0, import_project.isRealtimeSetup)()) {
+    typesToCheck.push("Subscription");
+  }
+  (0, import_graphql.visit)(schemaDocumentNode, {
+    InterfaceTypeDefinition(typeNode) {
+      if (RESERVED_TYPES.includes(typeNode.name.value)) {
+        reservedNameValidationOutput.push({
+          objectType: "interface",
+          name: typeNode.name.value
+        });
+      }
+    },
+    InputObjectTypeDefinition(typeNode) {
+      if (RESERVED_TYPES.includes(typeNode.name.value)) {
+        reservedNameValidationOutput.push({
+          objectType: "input type",
+          name: typeNode.name.value
+        });
+      }
+    },
+    ObjectTypeDefinition(typeNode) {
+      if (RESERVED_TYPES.includes(typeNode.name.value)) {
+        reservedNameValidationOutput.push({
+          objectType: "type",
+          name: typeNode.name.value
+        });
+      }
+      if (typesToCheck.includes(typeNode.name.value)) {
+        for (const field of typeNode.fields || []) {
+          const fieldName = field.name.value;
+          const fieldTypeName = typeNode.name.value;
+          const isLegacyRedwoodQuery = fieldName === "redwood" && fieldTypeName === "Query";
+          const isCedarQuery = fieldName === "cedar" && fieldTypeName === "Query" || // TODO: Remove this when I remove the root schema
+          fieldName === "cedarjs" && fieldTypeName === "Query";
+          const isCurrentUserQuery = fieldName === "currentUser" && fieldTypeName === "Query";
+          if (!(isCedarQuery || isCurrentUserQuery || isLegacyRedwoodQuery)) {
+            const hasDirective = field.directives?.length;
+            if (!hasDirective) {
+              validationOutput.push(`${fieldName} ${fieldTypeName}`);
+            }
+            field.directives?.forEach((directive) => {
+              if (directive.name.value === "requireAuth") {
+                directive.arguments?.forEach((arg) => {
+                  if (arg.name.value === "roles") {
+                    if (arg.value.kind !== import_graphql.Kind.STRING && arg.value.kind !== import_graphql.Kind.LIST) {
+                      directiveRoleValidationOutput.push({
+                        fieldName,
+                        invalid: arg.value.kind
+                      });
+                    }
+                    if (arg.value.kind === import_graphql.Kind.LIST) {
+                      const invalidValues = arg.value.values?.filter(
+                        (val) => val.kind !== import_graphql.Kind.STRING
+                      );
+                      if (invalidValues.length > 0) {
+                        invalidValues.forEach((invalid) => {
+                          directiveRoleValidationOutput.push({
+                            fieldName,
+                            invalid: invalid.kind
+                          });
+                        });
+                      }
+                    }
+                  }
+                });
+              }
+            });
+          }
+        }
+      }
+    }
+  });
+  if (validationOutput.length > 0) {
+    const fieldsWithoutDirectives = validationOutput.map(
+      (field) => `- ${field}`
+    );
+    throw new Error(
+      `${DIRECTIVE_REQUIRED_ERROR_MESSAGE} for
+${fieldsWithoutDirectives.join(
+        "\n"
+      )} 
+`
+    );
+  }
+  if (directiveRoleValidationOutput.length > 0) {
+    const fieldWithInvalidRoleValues = directiveRoleValidationOutput.map(
+      (field) => `- ${field.fieldName} has an invalid ${field.invalid}`
+    );
+    throw new RangeError(
+      `${DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE}
+
+${fieldWithInvalidRoleValues.join(
+        "\n"
+      )} 
+
+For example: @requireAuth(roles: "admin") or @requireAuth(roles: ["admin", "editor"])`
+    );
+  }
+  if (reservedNameValidationOutput.length > 0) {
+    const reservedNameMsg = reservedNameValidationOutput.map(
+      (output) => {
+        return `The ${output.objectType} named '${output.name}' is a reserved GraphQL name.
+Please rename it to something more specific, like: Application${output.name}.
+`;
+      }
+    );
+    throw new TypeError(reservedNameMsg.join("\n"));
+  }
+}
+const loadAndValidateSdls = async () => {
+  const projectTypeSrc = await (0, import_load.loadTypedefs)(
+    [
+      "graphql/**/*.sdl.{js,ts}",
+      "directives/**/*.{js,ts}",
+      "subscriptions/**/*.{js,ts}"
+    ],
+    {
+      loaders: [
+        new import_code_file_loader.CodeFileLoader({
+          noRequire: true,
+          pluckConfig: {
+            globalGqlIdentifierName: "gql"
+          }
+        })
+      ],
+      cwd: (0, import_project_config.getPaths)().api.src
+    }
+  );
+  const projectDocumentNodes = Object.values(projectTypeSrc).map(({ document }) => document).filter((documentNode) => {
+    return !!documentNode;
+  });
+  const mergedDocumentNode = (0, import_merge.mergeTypeDefs)([
+    import_graphql_server.rootSchema.schema,
+    projectDocumentNodes
+  ]);
+  validateSchema(mergedDocumentNode);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE,
+  DIRECTIVE_REQUIRED_ERROR_MESSAGE,
+  RESERVED_TYPES,
+  loadAndValidateSdls,
+  validateSchema
+});

package/dist/generate/clientPreset.d.ts

@@ -1,5 +1,12 @@
 export declare const shouldGenerateTrustedDocuments: () => boolean;
 export declare const generateClientPreset: () => Promise<{
+    clientPresetFiles: string[];
+    trustedDocumentsStoreFile: never[];
+    errors: {
+        message: string;
+        error: unknown;
+    }[];
+} | {
     clientPresetFiles: string[];
     trustedDocumentsStoreFile: string;
     errors: {

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

@@ -1 +1 @@
-{"version":3,"file":"clientPreset.d.ts","sourceRoot":"","sources":["../../src/generate/clientPreset.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,8BAA8B,QAAO,OAIjD,CAAA;AAED,eAAO,MAAM,oBAAoB;;;;iBAGN,MAAM;eAAS,OAAO;;EAiEhD,CAAA"}
+{"version":3,"file":"clientPreset.d.ts","sourceRoot":"","sources":["../../src/generate/clientPreset.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,8BAA8B,QAAO,OAIjD,CAAA;AAED,eAAO,MAAM,oBAAoB;;;;iBAGN,MAAM;eAAS,OAAO;;;;;;iBAAtB,MAAM;eAAS,OAAO;;EAoDhD,CAAA"}

package/dist/generate/clientPreset.js

@@ -1,4 +1,3 @@
-import path from "node:path";
 import { generate } from "@graphql-codegen/cli";
 import { addTypenameSelectionDocumentTransform } from "@graphql-codegen/client-preset";
 import { getConfig, getPaths } from "@cedarjs/project-config";
@@ -14,17 +13,16 @@ const generateClientPreset = async () => {
   let clientPresetFiles = [];
   const errors = [];
   if (!shouldGenerateTrustedDocuments()) {
-    return { clientPresetFiles, trustedDocumentsStoreFile: "", errors };
+    return { clientPresetFiles, trustedDocumentsStoreFile: [], errors };
   }
-  const documentsGlob = "./web/src/**/!(*.d).{ts,tsx,js,jsx}";
+  const documentsGlob = `${getPaths().web.src}/**/!(*.d).{ts,tsx,js,jsx}`;
   const config = {
-    cwd: getPaths().base,
     schema: getPaths().generated.schema,
     documents: documentsGlob,
     silent: true,
     // Plays nicely with cli task output
     generates: {
-      ["./web/src/graphql/"]: {
+      [`${getPaths().web.src}/graphql/`]: {
         preset: "client",
         presetConfig: {
           persistedDocuments: true
@@ -37,12 +35,7 @@ const generateClientPreset = async () => {
     }
   };
   try {
-    const generatedFiles = (await generate(config, true)).map(
-      (f) => ({
-        ...f,
-        filename: path.resolve(getPaths().base, f.filename)
-      })
-    );
+    const generatedFiles = await generate(config, true);
     clientPresetFiles = generatedFiles.map((f) => f.filename);
     const trustedDocumentsStoreFile = await trustedDocumentsStore(generatedFiles);
     replaceGqlTagWithTrustedDocumentGraphql(generatedFiles);
@@ -58,7 +51,7 @@ const generateClientPreset = async () => {
     });
     return {
       clientPresetFiles,
-      trustedDocumentsStoreFile: "",
+      trustedDocumentsStoreFile: [],
       errors
     };
   }

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;;;;;;EAmDpB,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

@@ -11,16 +11,11 @@ const generate = async () => {
   const { schemaPath, errors: generateGraphQLSchemaErrors } = await generateGraphQLSchema();
   const { typeDefFiles, errors: generateTypeDefsErrors } = await generateTypeDefs();
   const clientPresetFiles = [];
-  const clientPresetErrors = [];
   const { possibleTypesFiles, errors: generatePossibleTypesErrors } = await generatePossibleTypes();
   const { files: gqlormFiles, errors: gqlormErrors } = await generateGqlormArtifacts();
   if (config.graphql.trustedDocuments) {
     const preset = await generateClientPreset();
     clientPresetFiles.push(...preset.clientPresetFiles);
-    if (preset.trustedDocumentsStoreFile) {
-      clientPresetFiles.push(preset.trustedDocumentsStoreFile);
-    }
-    clientPresetErrors.push(...preset.errors);
   }
   let files = [];
   if (schemaPath !== "") {
@@ -39,7 +34,6 @@ const generate = async () => {
       ...generateGraphQLSchemaErrors,
       ...generateTypeDefsErrors,
       ...generatePossibleTypesErrors,
-      ...clientPresetErrors,
       ...gqlormErrors
     ]
   };

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

@@ -1 +1 @@
-{"version":3,"file":"graphqlCodeGen.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlCodeGen.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAmB9D,KAAK,aAAa,GAAG;IACnB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAiFvE,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAwDvE,CAAA;AAmCD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AA2OD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}
+{"version":3,"file":"graphqlCodeGen.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlCodeGen.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAmB9D,KAAK,aAAa,GAAG;IACnB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAiFvE,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAwDvE,CAAA;AAmCD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AAmKD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}

package/dist/generate/graphqlCodeGen.js

@@ -171,37 +171,15 @@ function getLoadDocumentsOptions(filename) {
   };
   return loadTypedefsConfig;
 }
-class PrismaModelsFormatError extends Error {
-}
-const MODEL_REEXPORT_RE = /^export type \* from '\.\/models\/(\w+)\.\w+'/gm;
-function readPrismaModelNames(clientPath) {
-  const ext = path.extname(clientPath);
-  const modelsPath = path.join(path.dirname(clientPath), `models${ext}`);
-  const source = fs.readFileSync(modelsPath, "utf8");
-  const modelNames = {};
-  for (const match of source.matchAll(MODEL_REEXPORT_RE)) {
-    modelNames[match[1]] = match[1];
-  }
-  if (Object.keys(modelNames).length === 0) {
-    throw new PrismaModelsFormatError(
-      `Could not read any Prisma model names from ${modelsPath}. Expected lines like \`export type * from './models/Post.ts'\`. This is most likely a change in what Prisma generates. Please open an issue at https://github.com/cedarjs/cedar/issues.`
-    );
-  }
-  return modelNames;
-}
-async function readGeneratedPrismaModelNames() {
+async function importGeneratedPrismaClient() {
   const cacheBuster = `?t=${Date.now()}`;
   const { clientPath, error } = await resolveGeneratedPrismaClient();
   if (!clientPath) {
     throw new Error(error);
   }
-  if (/\.[mc]?ts$/.test(clientPath)) {
-    return readPrismaModelNames(clientPath);
-  }
   const fileUrl = pathToFileURL(clientPath).href + cacheBuster;
   const freshPrisma = await import(fileUrl);
-  const modelName = getModelName(freshPrisma);
-  return modelName ?? {};
+  return freshPrisma;
 }
 function isModelNameRecord(value) {
   if (typeof value !== "object" || value === null) {
@@ -228,27 +206,23 @@ function getModelName(mod) {
 }
 async function getPrismaClient() {
   try {
-    const modelName = await readGeneratedPrismaModelNames();
-    if (Object.keys(modelName).length > 0) {
+    const localPrisma = await importGeneratedPrismaClient();
+    const modelName = getModelName(localPrisma);
+    if (modelName) {
       return { ModelName: modelName };
     }
-  } catch (e) {
-    if (e instanceof PrismaModelsFormatError) {
-      throw e;
-    }
+  } catch {
   }
   const pm = getPackageManager();
   const pmExec = pm === "npm" ? "npx" : pm;
   execa.sync(pmExec, ["cedar", "prisma", "generate"]);
   try {
-    const modelName = await readGeneratedPrismaModelNames();
-    if (Object.keys(modelName).length > 0) {
+    const freshPrisma = await importGeneratedPrismaClient();
+    const modelName = getModelName(freshPrisma);
+    if (modelName) {
       return { ModelName: modelName };
     }
-  } catch (e) {
-    if (e instanceof PrismaModelsFormatError) {
-      throw e;
-    }
+  } catch {
   }
   return { ModelName: {} };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"graphqlSchema.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlSchema.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,qBAAqB;;;iBA2DP,MAAM;eAAS,OAAO;;EA2EhD,CAAA"}
+{"version":3,"file":"graphqlSchema.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlSchema.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,qBAAqB;;;iBA2DP,MAAM;eAAS,OAAO;;EA2EhD,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/generate/templates.ts"],"names":[],"mappings":"AAKA;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,cAAc,MAAM,EACpB,aAAa,MAAM,EACnB,iBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,SAY7C,CAAA"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/generate/templates.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,cAAc,MAAM,EACpB,aAAa,MAAM,EACnB,iBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,SAY7C,CAAA"}

package/dist/generate/templates.js

@@ -1,6 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
-const ___dirname = import.meta.dirname;
+const ___dirname = (
+  // __dirname will work for CJS, and import.meta.dirname will work for ESM
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  typeof __dirname !== "undefined" ? __dirname : import.meta?.dirname
+);
 const writeTemplate = (templatePath, destination, templateValues = {}) => {
   const templateString = fs.readFileSync(
     path.join(___dirname, templatePath),

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

@@ -1 +1 @@
-{"version":3,"file":"typeDefinitions.d.ts","sourceRoot":"","sources":["../../src/generate/typeDefinitions.ts"],"names":[],"mappings":"AA8CA;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;;;;EA0B5B,CAAA;AAED,eAAO,MAAM,mCAAmC,gBAK/C,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,aASvB,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,WAoDvB,CAAA;AAED,eAAO,MAAM,mBAAmB,gBAG/B,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,GAAG,MAAM,EAAE,mDAAsB,aAQlE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,EAAE,mDAAsB,WAiFnE,CAAA;AAiBD,eAAO,MAAM,2BAA2B,gBAmEvC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBA8CtC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,qBAAqB,gBAEjC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAEpC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAKpC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,4BAA4B,gBAExC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gCAAgC,gBAW5C,CAAA"}
+{"version":3,"file":"typeDefinitions.d.ts","sourceRoot":"","sources":["../../src/generate/typeDefinitions.ts"],"names":[],"mappings":"AAyCA;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;;;;EA0B5B,CAAA;AAED,eAAO,MAAM,mCAAmC,gBAK/C,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,aASvB,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,WAoDvB,CAAA;AAED,eAAO,MAAM,mBAAmB,gBAG/B,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,GAAG,MAAM,EAAE,mDAAsB,aAQlE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,EAAE,mDAAsB,WA8DnE,CAAA;AAiBD,eAAO,MAAM,2BAA2B,gBAmEvC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBA8CtC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,qBAAqB,gBAEjC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAEpC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAKpC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,4BAA4B,gBAExC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gCAAgC,gBAW5C,CAAA"}

package/dist/generate/typeDefinitions.js

@@ -3,18 +3,13 @@ import path from "path";
 import { SourceMapGenerator } from "source-map";
 import { getPaths, processPagesDir } from "@cedarjs/project-config";
 import {
-  getCellGqlFragment,
   getCellGqlQuery,
   fileToAst,
   getDefaultExportLocation,
   getNamedExports
 } from "../ast.js";
 import { findCells, findDirectoryNamedModules } from "../files.js";
-import {
-  parseGqlFragmentName,
-  parseGqlFragmentPropName,
-  parseGqlQueryToAst
-} from "../gql.js";
+import { parseGqlQueryToAst } from "../gql.js";
 import { getJsxElements } from "../jsx.js";
 import {
   generateTypeDefGraphQLApi,
@@ -120,9 +115,6 @@ const generateMirrorCell = (p, rwjsPaths = getPaths()) => {
   const { name } = path.parse(p);
   const fileContents = fileToAst(p);
   const cellQuery = getCellGqlQuery(fileContents);
-  const cellFragment = cellQuery ? void 0 : getCellGqlFragment(fileContents);
-  const cellFragmentName = cellFragment ? parseGqlFragmentName(cellFragment) : void 0;
-  const cellFragmentPropName = cellFragment ? parseGqlFragmentPropName(cellFragment) : void 0;
   if (cellQuery) {
     const gqlDoc = parseGqlQueryToAst(cellQuery)[0];
     writeTemplate("templates/mirror-cell.d.ts.template", typeDefPath, {
@@ -130,12 +122,6 @@ const generateMirrorCell = (p, rwjsPaths = getPaths()) => {
       queryResultType: `${gqlDoc?.name}`,
       queryVariablesType: `${gqlDoc?.name}Variables`
     });
-  } else if (cellFragmentName && cellFragmentPropName) {
-    writeTemplate("templates/mirror-cell-fragment.d.ts.template", typeDefPath, {
-      name,
-      fragmentType: cellFragmentName,
-      fragmentPropName: cellFragmentPropName
-    });
   } else {
     writeTemplate("templates/mirror-cell.d.ts.template", typeDefPath, {
       name,

package/dist/gql.d.ts

@@ -9,26 +9,6 @@ interface Field {
 }
 export declare const parseGqlQueryToAst: (gqlQuery: string) => Operation[];
 export declare const parseDocumentAST: (document: DocumentNode) => Operation[];
-/**
- * Returns the name of the first fragment definition in the given GraphQL
- * source, e.g. `AuthorCell_author` for
- * `fragment AuthorCell_author on User { fullName }`
- */
-export declare const parseGqlFragmentName: (gqlFragment: string) => string | undefined;
-/**
- * Derives a fragment Cell's data prop name from its fragment: the prop the
- * parent Cell passes the fragment data in with, and the prop `Success`
- * receives the data as.
- *
- * For a fragment named with an underscore, like `AuthorCell_author`, the part
- * after the last underscore is used (`author`). Otherwise the type the
- * fragment is defined on is used, camelCased (`on User` -> `user`).
- *
- * Keep this in sync with getFragmentPropName in
- * packages/web/src/components/cell/createFragmentCell.tsx, which is what the
- * fragment Cell runtime uses.
- */
-export declare const parseGqlFragmentPropName: (gqlFragment: string) => string | undefined;
 export declare const listQueryTypeFieldsInProject: () => Promise<string[]>;
 export {};
 //# sourceMappingURL=gql.d.ts.map

package/dist/gql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gql.d.ts","sourceRoot":"","sources":["../src/gql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EAKZ,iBAAiB,EAClB,MAAM,SAAS,CAAA;AAMhB,UAAU,SAAS;IACjB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,UAAU,KAAK;IACb,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,gBAGlD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,YAAY,gBAoBtD,CAAA;AAyCD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM,uBAEvD,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GAAI,aAAa,MAAM,uBAiB3D,CAAA;AAED,eAAO,MAAM,4BAA4B,yBA8BxC,CAAA"}
+{"version":3,"file":"gql.d.ts","sourceRoot":"","sources":["../src/gql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EAIZ,iBAAiB,EAClB,MAAM,SAAS,CAAA;AAMhB,UAAU,SAAS;IACjB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,UAAU,KAAK;IACb,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,gBAGlD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,YAAY,gBAoBtD,CAAA;AAgCD,eAAO,MAAM,4BAA4B,yBA8BxC,CAAA"}