@cedarjs/cli 3.0.0-canary.13465 → 3.0.0-canary.13469

package/dist/commands/generate/dataMigration/dataMigration.js

@@ -1,12 +1,16 @@
-import fs from "node:fs";
 import path from "node:path";
 import { paramCase } from "change-case";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { dbReexportsPrismaClient } from "@cedarjs/internal/dist/project";
 import { getDataMigrationsPath } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
-import { getPaths, writeFilesTask } from "../../../lib/index.js";
+import {
+  generateTemplate,
+  getPaths,
+  writeFilesTask
+} from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
 import { getYargsDefaults } from "../yargsCommandHelpers.js";
@@ -40,8 +44,12 @@ const files = async ({ name, typescript }) => {
     getPaths().api.prismaConfig
   );
   const outputPath = path.join(dataMigrationsPath, outputFilename);
+  const prismaImportSource = dbReexportsPrismaClient() ? "src/lib/db" : "@prisma/client";
   return {
-    [outputPath]: fs.readFileSync(TEMPLATE_PATHS[extension]).toString()
+    [outputPath]: await generateTemplate(TEMPLATE_PATHS[extension], {
+      name,
+      prismaImportSource
+    })
   };
 };
 const command = "data-migration <name>";

package/dist/commands/generate/dataMigration/templates/dataMigration.js.template

@@ -1,5 +1,5 @@
 /**
- * @typedef { import("@prisma/client").PrismaClient } PrismaClient
+ * @typedef { import("${prismaImportSource}").PrismaClient } PrismaClient
  * @param {{db: PrismaClient}} db
  */
 export default async ({ db }) => {

package/dist/commands/generate/dataMigration/templates/dataMigration.ts.template

@@ -1,4 +1,4 @@
-import type { PrismaClient } from '@prisma/client'
+import type { PrismaClient } from '${prismaImportSource}'
 
 export default async ({ db }: { db: PrismaClient }) => {
   // Migration here...

package/dist/commands/generate/service/serviceHandler.js

@@ -1,5 +1,6 @@
 import path from "node:path";
 import camelcase from "camelcase";
+import { dbReexportsPrismaClient } from "@cedarjs/internal/dist/project";
 import { pluralize, singularize } from "../../../lib/cedarPluralize.js";
 import { transformTSToJS } from "../../../lib/index.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
@@ -222,6 +223,7 @@ const files = async ({
   const componentName = camelcase(pluralize(name));
   const model = name;
   const idName = await getIdName(model);
+  const prismaImportSource = dbReexportsPrismaClient() ? "src/lib/db" : "@prisma/client";
   const modelRelations = relations || relationsForModel(await getSchema(model));
   const serviceFile = await templateForFile({
     name,
@@ -230,7 +232,12 @@ const files = async ({
     generator: "service",
     outputPath: path.join(componentName, componentName + ".ts"),
     templatePath: "service.ts.template",
-    templateVars: { relations: modelRelations, idName, ...rest }
+    templateVars: {
+      relations: modelRelations,
+      idName,
+      prismaImportSource,
+      ...rest
+    }
   });
   const testFile = await templateForFile({
     name,
@@ -249,6 +256,7 @@ const files = async ({
       ),
       prismaModel: model,
       idName,
+      prismaImportSource,
       ...rest
     }
   });
@@ -265,6 +273,7 @@ const files = async ({
       prismaModel: model,
       idName,
       relations: modelRelations,
+      prismaImportSource,
       ...rest
     }
   });

package/dist/commands/generate/service/templates/scenarios.ts.template

@@ -1,6 +1,8 @@
-import type { Prisma, ${prismaModel} } from '@prisma/client'
+<% if (prismaImportSource === 'src/lib/db') { %>import type { ScenarioData } from '@cedarjs/testing/api'
 
-import type { ScenarioData } from '@cedarjs/testing/api'
+import type { Prisma, ${prismaModel} } from '${prismaImportSource}'<% } else { %>import type { Prisma, ${prismaModel} } from '${prismaImportSource}'
+
+import type { ScenarioData } from '@cedarjs/testing/api'<% } %>
 
 export const standard = defineScenario<Prisma.${prismaModel}CreateArgs>(${stringifiedScenario})
 

package/dist/commands/generate/service/templates/test.ts.template

@@ -31,7 +31,7 @@
     // Not all values can be represented as JSON, like function invocations
     return jsonString.replace(/"new Uint8Array\(([^)]+)\)"/g, 'new Uint8Array($1)')
   } %>
-<% if (prismaImport) { %>import { Prisma, ${prismaModel} } from '@prisma/client'<% } else { %>import type { ${prismaModel} } from '@prisma/client'<% } %>
+<% if (prismaImport) { %>import { Prisma, ${prismaModel} } from '${prismaImportSource}'<% } else { %>import type { ${prismaModel} } from '${prismaImportSource}'<% } %>
 
 import { ${pluralCamelName}<% if (crud) { %>,${singularCamelName}, create${singularPascalName}, update${singularPascalName}, delete${singularPascalName}<% } %> } from './${pluralCamelName}.js'
 import type { StandardScenario } from './${pluralCamelName}.scenarios.js'

package/dist/lib/test.js

@@ -26,6 +26,7 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
           ),
           dataMigrations: path.join(BASE_PATH, "./api/dataMigrations"),
           src: path.join(BASE_PATH, "./api/src"),
+          lib: path.join(BASE_PATH, "./api/src/lib"),
           jobs: path.join(BASE_PATH, "./api/src/jobs"),
           services: path.join(BASE_PATH, "./api/src/services"),
           directives: path.join(BASE_PATH, "./api/src/directives"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13465+4edd2ae3e",
+  "version": "3.0.0-canary.13469+0a2f4b095",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,15 +34,15 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "3.0.0-canary.13465",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13465",
-    "@cedarjs/fastify-web": "3.0.0-canary.13465",
-    "@cedarjs/internal": "3.0.0-canary.13465",
-    "@cedarjs/prerender": "3.0.0-canary.13465",
-    "@cedarjs/project-config": "3.0.0-canary.13465",
-    "@cedarjs/structure": "3.0.0-canary.13465",
-    "@cedarjs/telemetry": "3.0.0-canary.13465",
-    "@cedarjs/web-server": "3.0.0-canary.13465",
+    "@cedarjs/api-server": "3.0.0-canary.13469",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13469",
+    "@cedarjs/fastify-web": "3.0.0-canary.13469",
+    "@cedarjs/internal": "3.0.0-canary.13469",
+    "@cedarjs/prerender": "3.0.0-canary.13469",
+    "@cedarjs/project-config": "3.0.0-canary.13469",
+    "@cedarjs/structure": "3.0.0-canary.13469",
+    "@cedarjs/telemetry": "3.0.0-canary.13469",
+    "@cedarjs/web-server": "3.0.0-canary.13469",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -106,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4edd2ae3ed2cf81559af27caa0411081c4fbcf91"
+  "gitHead": "0a2f4b095ba8dc19b7838c99e4f1115e214a4dd0"
 }