arkos 1.4.0-canary.87 → 1.4.0-canary.89

package/dist/cjs/utils/cli/dev.js

@@ -32,6 +32,9 @@ async function devCommand(options = {}) {
             console.error(`Could not find application entry point at ${entryPoint}`);
             process.exit(1);
         }
+        const baseServiceTypesPath = path_1.default.resolve(process.cwd(), `node_modules/@arkos/types/base.service.ts`);
+        if (fileExt === "ts" && !fs_1.default.existsSync(baseServiceTypesPath))
+            throw Error('Missing BaseService types please run "npx arkos prisma generate" to generate and sync the types from @prisma/client, see more at https://www.arkosjs.com/docs/cli/built-in-cli#typescript-types-generation.');
         const getEnv = () => ({
             NODE_ENV: "development",
             ...process.env,
@@ -140,7 +143,8 @@ async function devCommand(options = {}) {
         });
     }
     catch (error) {
-        console.error("Development server failed to start:", error);
+        sheu_1.default.error("Development server failed to start:");
+        console.error(error);
         if (child) {
             child?.kill?.();
             child = null;

package/dist/cjs/utils/cli/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/utils/cli/dev.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, ChildProcess } from \"child_process\";\nimport chokidar from \"chokidar\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport sheu from \"../sheu\";\nimport portAndHostAllocator from \"../features/port-and-host-allocator\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\n\ninterface DevOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Dev server command for the arkos CLI\n */\nexport async function devCommand(options: DevOptions = {}) {\n  if (process.env.NODE_ENV === \"test\" || !process.env.NODE_ENV)\n    process.env.NODE_ENV = \"development\";\n  envFiles = loadEnvironmentVariables();\n  child = null;\n  let restartTimeout: NodeJS.Timeout | null = null;\n\n  try {\n    const { port, host } = options;\n    let isRestarting = false;\n    let restartingFiles = new Set<string>();\n\n    const fileExt = getUserFileExtension();\n    const entryPoint = path.resolve(process.cwd(), `src/app.${fileExt}`);\n\n    if (!fs.existsSync(entryPoint)) {\n      console.error(`Could not find application entry point at ${entryPoint}`);\n      process.exit(1);\n    }\n\n    const getEnv = () =>\n      ({\n        NODE_ENV: \"development\",\n        ...process.env,\n        ...(port && { CLI_PORT: port }),\n        ...(host && { CLI_HOST: host }),\n        CLI: \"false\",\n      }) as { [x: string]: string };\n\n    const startServer = () => {\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      const env = getEnv();\n\n      if (fileExt === \"ts\") {\n        child = spawn(\"npx\", [\"tsx-strict\", \"--watch\", entryPoint], {\n          stdio: \"inherit\",\n          env,\n          shell: true,\n        });\n      } else {\n        child = spawn(\n          \"npx\",\n          [\"tsx-strict\", \"--no-type-check\", \"--watch\", entryPoint],\n          {\n            stdio: \"inherit\",\n            env,\n            shell: true,\n          }\n        );\n      }\n\n      if (child) {\n        child.on(\"error\", (error) => {\n          console.error(\"Failed to start server:\", error);\n        });\n\n        child.on(\"exit\", (code, signal) => {\n          if (!isRestarting && signal !== \"SIGTERM\" && signal !== \"SIGINT\") {\n            console.info(`Server exited with code ${code}, restarting...`);\n            startServer();\n          }\n        });\n      }\n    };\n\n    const scheduleRestart = (reason: string, filePath?: string) => {\n      if (filePath) restartingFiles.add(filePath);\n\n      if (restartTimeout) clearTimeout(restartTimeout);\n      const now = new Date();\n      const time = now.toTimeString().split(\" \")[0];\n\n      isRestarting = true;\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      restartTimeout = setTimeout(() => {\n        sheu.info(`\\x1b[90m${time}\\x1b[0m Restarting: ${reason.toLowerCase()}`);\n        startServer();\n        isRestarting = false;\n        restartTimeout = null;\n        if (filePath) restartingFiles.delete(filePath);\n      }, 1000);\n    };\n\n    const setupEnvWatcher = () => {\n      const envWatcher = chokidar.watch(\n        fullCleanCwd(envFiles?.join(\",\") || \"\")\n          .replaceAll(\"/\", \"\")\n          .split(\",\") || [],\n        {\n          ignoreInitial: true,\n          persistent: true,\n        }\n      );\n\n      envWatcher.on(\"all\", (_, filePath) => {\n        try {\n          envFiles = loadEnvironmentVariables();\n          scheduleRestart(\"Environment files changed\", \"env-files\");\n        } catch (error) {\n          console.error(`Error reloading ${filePath}:`, error);\n        }\n      });\n\n      return envWatcher;\n    };\n\n    startServer();\n\n    const envWatcher = setupEnvWatcher();\n\n    const env = getEnv();\n    const hostAndPort = await portAndHostAllocator.getHostAndAvailablePort(\n      env,\n      { logWarning: true }\n    );\n\n    watermarkStamper.stamp({\n      ...hostAndPort,\n      envFiles,\n    });\n\n    const cleanup = () => {\n      if (restartTimeout) clearTimeout(restartTimeout);\n\n      if (envWatcher) envWatcher.close();\n\n      if (child) {\n        child.kill(\"SIGTERM\");\n\n        setTimeout(() => {\n          if (child && !child.killed) child.kill(\"SIGKILL\");\n        }, 5000);\n      }\n\n      process.exit(0);\n    };\n\n    process.on(\"SIGINT\", cleanup);\n    process.on(\"SIGTERM\", cleanup);\n\n    process.on(\"uncaughtException\", (error) => {\n      console.error(\"Uncaught Exception:\", error);\n      cleanup();\n    });\n  } catch (error) {\n    console.error(\"Development server failed to start:\", error);\n\n    if (child) {\n      (child as ChildProcess)?.kill?.();\n      child = null;\n    }\n\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the development server child process\n */\nexport function killDevelopmentServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\n}\n"]}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/utils/cli/dev.ts"],"names":[],"mappings":";;;;;AAqBA,gCA4KC;AAKD,8EAGC;AAzMD,iDAAoD;AACpD,wDAAgC;AAChC,sDAA2E;AAC3E,sDAA6D;AAC7D,4CAAoB;AACpB,gDAAwB;AACxB,mDAA2B;AAC3B,kGAAuE;AACvE,kFAAyD;AAOzD,IAAI,KAAK,GAAwB,IAAI,CAAC;AACtC,IAAI,QAA8B,CAAC;AAK5B,KAAK,UAAU,UAAU,CAAC,UAAsB,EAAE;IACvD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC1D,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;IACvC,QAAQ,GAAG,IAAA,yCAAwB,GAAE,CAAC;IACtC,KAAK,GAAG,IAAI,CAAC;IACb,IAAI,cAAc,GAA0B,IAAI,CAAC;IAEjD,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAC/B,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;QAExC,MAAM,OAAO,GAAG,IAAA,iCAAoB,GAAE,CAAC;QACvC,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,OAAO,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,6CAA6C,UAAU,EAAE,CAAC,CAAC;YACzE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,oBAAoB,GAAG,cAAI,CAAC,OAAO,CACvC,OAAO,CAAC,GAAG,EAAE,EACb,2CAA2C,CAC5C,CAAC;QACF,IAAI,OAAO,KAAK,IAAI,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAC1D,MAAM,KAAK,CACT,6MAA6M,CAC9M,CAAC;QAEJ,MAAM,MAAM,GAAG,GAAG,EAAE,CAClB,CAAC;YACC,QAAQ,EAAE,aAAa;YACvB,GAAG,OAAO,CAAC,GAAG;YACd,GAAG,CAAC,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/B,GAAG,EAAE,OAAO;SACb,CAA4B,CAAC;QAEhC,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,IAAI,EAAE,CAAC;gBACb,KAAK,GAAG,IAAI,CAAC;YACf,CAAC;YAED,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;YAErB,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,KAAK,GAAG,IAAA,qBAAK,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE;oBAC1D,KAAK,EAAE,SAAS;oBAChB,GAAG;oBACH,KAAK,EAAE,IAAI;iBACZ,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,IAAA,qBAAK,EACX,KAAK,EACL,CAAC,YAAY,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,CAAC,EACxD;oBACE,KAAK,EAAE,SAAS;oBAChB,GAAG;oBACH,KAAK,EAAE,IAAI;iBACZ,CACF,CAAC;YACJ,CAAC;YAED,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC1B,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;gBAClD,CAAC,CAAC,CAAC;gBAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBAChC,IAAI,CAAC,YAAY,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;wBACjE,OAAO,CAAC,IAAI,CAAC,2BAA2B,IAAI,iBAAiB,CAAC,CAAC;wBAC/D,WAAW,EAAE,CAAC;oBAChB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,QAAiB,EAAE,EAAE;YAC5D,IAAI,QAAQ;gBAAE,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE5C,IAAI,cAAc;gBAAE,YAAY,CAAC,cAAc,CAAC,CAAC;YACjD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9C,YAAY,GAAG,IAAI,CAAC;YACpB,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,IAAI,EAAE,CAAC;gBACb,KAAK,GAAG,IAAI,CAAC;YACf,CAAC;YAED,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,cAAI,CAAC,IAAI,CAAC,WAAW,IAAI,uBAAuB,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBACxE,WAAW,EAAE,CAAC;gBACd,YAAY,GAAG,KAAK,CAAC;gBACrB,cAAc,GAAG,IAAI,CAAC;gBACtB,IAAI,QAAQ;oBAAE,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjD,CAAC,EAAE,IAAI,CAAC,CAAC;QACX,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,MAAM,UAAU,GAAG,kBAAQ,CAAC,KAAK,CAC/B,IAAA,yBAAY,EAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;iBACpC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC;iBACnB,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EACnB;gBACE,aAAa,EAAE,IAAI;gBACnB,UAAU,EAAE,IAAI;aACjB,CACF,CAAC;YAEF,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;gBACnC,IAAI,CAAC;oBACH,QAAQ,GAAG,IAAA,yCAAwB,GAAE,CAAC;oBACtC,eAAe,CAAC,2BAA2B,EAAE,WAAW,CAAC,CAAC;gBAC5D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,mBAAmB,QAAQ,GAAG,EAAE,KAAK,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC;QAEF,WAAW,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,eAAe,EAAE,CAAC;QAErC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QACrB,MAAM,WAAW,GAAG,MAAM,iCAAoB,CAAC,uBAAuB,CACpE,GAAG,EACH,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAC;QAEF,2BAAgB,CAAC,KAAK,CAAC;YACrB,GAAG,WAAW;YACd,QAAQ;SACT,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,cAAc;gBAAE,YAAY,CAAC,cAAc,CAAC,CAAC;YAEjD,IAAI,UAAU;gBAAE,UAAU,CAAC,KAAK,EAAE,CAAC;YAEnC,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAEtB,UAAU,CAAC,GAAG,EAAE;oBACd,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;wBAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpD,CAAC,EAAE,IAAI,CAAC,CAAC;YACX,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE/B,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;YACxC,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YAC5C,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,cAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAClD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAErB,IAAI,KAAK,EAAE,CAAC;YACT,KAAsB,EAAE,IAAI,EAAE,EAAE,CAAC;YAClC,KAAK,GAAG,IAAI,CAAC;QACf,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAKD,SAAgB,iCAAiC;IAC9C,KAAsB,EAAE,IAAI,EAAE,EAAE,CAAC;IAClC,KAAK,GAAG,IAAI,CAAC;AACf,CAAC","sourcesContent":["import { spawn, ChildProcess } from \"child_process\";\nimport chokidar from \"chokidar\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport sheu from \"../sheu\";\nimport portAndHostAllocator from \"../features/port-and-host-allocator\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\n\ninterface DevOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Dev server command for the arkos CLI\n */\nexport async function devCommand(options: DevOptions = {}) {\n  if (process.env.NODE_ENV === \"test\" || !process.env.NODE_ENV)\n    process.env.NODE_ENV = \"development\";\n  envFiles = loadEnvironmentVariables();\n  child = null;\n  let restartTimeout: NodeJS.Timeout | null = null;\n\n  try {\n    const { port, host } = options;\n    let isRestarting = false;\n    let restartingFiles = new Set<string>();\n\n    const fileExt = getUserFileExtension();\n    const entryPoint = path.resolve(process.cwd(), `src/app.${fileExt}`);\n\n    if (!fs.existsSync(entryPoint)) {\n      console.error(`Could not find application entry point at ${entryPoint}`);\n      process.exit(1);\n    }\n\n    const baseServiceTypesPath = path.resolve(\n      process.cwd(),\n      `node_modules/@arkos/types/base.service.ts`\n    );\n    if (fileExt === \"ts\" && !fs.existsSync(baseServiceTypesPath))\n      throw Error(\n        'Missing BaseService types please run \"npx arkos prisma generate\" to generate and sync the types from @prisma/client, see more at https://www.arkosjs.com/docs/cli/built-in-cli#typescript-types-generation.'\n      );\n\n    const getEnv = () =>\n      ({\n        NODE_ENV: \"development\",\n        ...process.env,\n        ...(port && { CLI_PORT: port }),\n        ...(host && { CLI_HOST: host }),\n        CLI: \"false\",\n      }) as { [x: string]: string };\n\n    const startServer = () => {\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      const env = getEnv();\n\n      if (fileExt === \"ts\") {\n        child = spawn(\"npx\", [\"tsx-strict\", \"--watch\", entryPoint], {\n          stdio: \"inherit\",\n          env,\n          shell: true,\n        });\n      } else {\n        child = spawn(\n          \"npx\",\n          [\"tsx-strict\", \"--no-type-check\", \"--watch\", entryPoint],\n          {\n            stdio: \"inherit\",\n            env,\n            shell: true,\n          }\n        );\n      }\n\n      if (child) {\n        child.on(\"error\", (error) => {\n          console.error(\"Failed to start server:\", error);\n        });\n\n        child.on(\"exit\", (code, signal) => {\n          if (!isRestarting && signal !== \"SIGTERM\" && signal !== \"SIGINT\") {\n            console.info(`Server exited with code ${code}, restarting...`);\n            startServer();\n          }\n        });\n      }\n    };\n\n    const scheduleRestart = (reason: string, filePath?: string) => {\n      if (filePath) restartingFiles.add(filePath);\n\n      if (restartTimeout) clearTimeout(restartTimeout);\n      const now = new Date();\n      const time = now.toTimeString().split(\" \")[0];\n\n      isRestarting = true;\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      restartTimeout = setTimeout(() => {\n        sheu.info(`\\x1b[90m${time}\\x1b[0m Restarting: ${reason.toLowerCase()}`);\n        startServer();\n        isRestarting = false;\n        restartTimeout = null;\n        if (filePath) restartingFiles.delete(filePath);\n      }, 1000);\n    };\n\n    const setupEnvWatcher = () => {\n      const envWatcher = chokidar.watch(\n        fullCleanCwd(envFiles?.join(\",\") || \"\")\n          .replaceAll(\"/\", \"\")\n          .split(\",\") || [],\n        {\n          ignoreInitial: true,\n          persistent: true,\n        }\n      );\n\n      envWatcher.on(\"all\", (_, filePath) => {\n        try {\n          envFiles = loadEnvironmentVariables();\n          scheduleRestart(\"Environment files changed\", \"env-files\");\n        } catch (error) {\n          console.error(`Error reloading ${filePath}:`, error);\n        }\n      });\n\n      return envWatcher;\n    };\n\n    startServer();\n\n    const envWatcher = setupEnvWatcher();\n\n    const env = getEnv();\n    const hostAndPort = await portAndHostAllocator.getHostAndAvailablePort(\n      env,\n      { logWarning: true }\n    );\n\n    watermarkStamper.stamp({\n      ...hostAndPort,\n      envFiles,\n    });\n\n    const cleanup = () => {\n      if (restartTimeout) clearTimeout(restartTimeout);\n\n      if (envWatcher) envWatcher.close();\n\n      if (child) {\n        child.kill(\"SIGTERM\");\n\n        setTimeout(() => {\n          if (child && !child.killed) child.kill(\"SIGKILL\");\n        }, 5000);\n      }\n\n      process.exit(0);\n    };\n\n    process.on(\"SIGINT\", cleanup);\n    process.on(\"SIGTERM\", cleanup);\n\n    process.on(\"uncaughtException\", (error) => {\n      console.error(\"Uncaught Exception:\", error);\n      cleanup();\n    });\n  } catch (error) {\n    sheu.error(\"Development server failed to start:\");\n    console.error(error);\n\n    if (child) {\n      (child as ChildProcess)?.kill?.();\n      child = null;\n    }\n\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the development server child process\n */\nexport function killDevelopmentServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\n}\n"]}

package/dist/cjs/utils/cli/prisma-generate.js

@@ -12,10 +12,24 @@ const sheu_1 = __importDefault(require("../sheu"));
 const path_1 = __importDefault(require("path"));
 function prismaGenerateCommand() {
     const content = `
-import { ModelGroupRelationFields } from "./utils/helpers/base.service.helpers.js";
-import { ServiceBaseContext } from "./types/base.service.types.js";
+import { ServiceBaseContext } from "arkos/services";
 import { Prisma, PrismaClient } from "@prisma/client"
 
+export interface PrismaField {
+  name: string;
+  type: string;
+  isOptional: boolean;
+  isArray: boolean;
+  foreignKeyField?: string;
+  foreignReferenceField?: string;
+  isRelation: boolean;
+  defaultValue?: any;
+  isId?: boolean;
+  isUnique?: boolean;
+  attributes: string[];
+}
+
+
 export declare type ModelsGetPayload<T extends Record<string, any>> = {
 ${prisma_schema_parser_1.default.models.map((model) => `
     "${(0, change_case_helpers_1.kebabCase)(model.name)}": {
@@ -42,7 +56,10 @@ export declare class BaseService<
     TModelName extends keyof ModelsGetPayload<any>
 > {
     modelName: TModelName;
-    relationFields: ModelGroupRelationFields;
+    relationFields: {
+        singular: PrismaField[] | undefined;
+        list: PrismaField[] | undefined;
+    };
     prisma: PrismaClient;
     
     constructor(modelName: TModelName);
@@ -111,8 +128,21 @@ export declare class BaseService<
 }
 `;
     (0, child_process_1.execSync)("npx prisma generate", { stdio: "inherit" });
-    const filePath = path_1.default.resolve(path_1.default.resolve(), `../../../types/modules/base/base.service.d.ts`);
-    fs_1.default.writeFileSync(filePath, content, {
+    const filePath = path_1.default.resolve(process.cwd(), `node_modules/@arkosjs/types/`);
+    fs_1.default.mkdirSync(filePath, { recursive: true });
+    fs_1.default.writeFileSync(filePath + "/base.service.d.ts", content, {
+        encoding: "utf8",
+    });
+    const pkgPath = path_1.default.resolve(process.cwd(), `node_modules/@arkosjs/types/package.json`);
+    const pkgJsonContent = `{
+      "name": "@arkosjs/types",
+      "version": "1.0.0",
+      "types": "./base.service.d.ts",
+      "exports": {
+        "./base.service": "./base.service.d.ts"
+      }
+    }`;
+    fs_1.default.writeFileSync(pkgPath, pkgJsonContent, {
         encoding: "utf8",
     });
     sheu_1.default.done("Types for @prisma/client and base service generated successfully!");

package/dist/cjs/utils/cli/prisma-generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"prisma-generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/prisma-generate.ts"],"names":[],"mappings":";;;;;AASA,wCAoHC;AA7HD,0FAAgE;AAChE,wEAA2D;AAC3D,4CAAoB;AACpB,iDAAyC;AACzC,mDAA2B;AAC3B,gDAAwB;AAIxB,SAAwB,qBAAqB;IACzC,MAAM,OAAO,GAAG;;;;;;EAMlB,8BAAkB,CAAC,MAAM,CAAC,GAAG,CAC3B,CAAC,KAAK,EAAE,EAAE,CACN;OACD,IAAA,+BAAS,EAAC,KAAK,CAAC,IAAI,CAAC;2BACD,KAAK,CAAC,IAAI;6BACR,KAAK,CAAC,IAAI;+BACR,KAAK,CAAC,IAAI;gCACT,KAAK,CAAC,IAAI;6BACb,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;4BACf,KAAK,CAAC,IAAI;;CAErC,CACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8EA,CAAC;IACE,IAAA,wBAAQ,EAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtD,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CACzB,cAAI,CAAC,OAAO,EAAE,EACd,+CAA+C,CAClD,CAAC;IACF,YAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE;QAChC,QAAQ,EAAE,MAAM;KACnB,CAAC,CAAC;IAEH,cAAI,CAAC,IAAI,CACL,mEAAmE,CACtE,CAAC;AACN,CAAC","sourcesContent":["import prismaSchemaParser from \"../prisma/prisma-schema-parser\";\nimport { kebabCase } from \"../helpers/change-case.helpers\";\nimport fs from \"fs\";\nimport { execSync } from \"child_process\";\nimport sheu from \"../sheu\";\nimport path from \"path\";\nimport { fileURLToPath } from \"url\";\nimport { dirname } from \"path\";\n\nexport default function prismaGenerateCommand() {\n    const content = `\nimport { ModelGroupRelationFields } from \"./utils/helpers/base.service.helpers\";\nimport { ServiceBaseContext } from \"./types/base.service.types\";\nimport { Prisma, PrismaClient } from \"@prisma/client\"\n\nexport declare type ModelsGetPayload<T extends Record<string, any>> = {\n${prismaSchemaParser.models.map(\n    (model) =>\n        `\n    \"${kebabCase(model.name)}\": {\n        Delegate: Prisma.${model.name}Delegate,\n        GetPayload: Prisma.${model.name}GetPayload<T>,\n        FindManyArgs: Prisma.${model.name}FindManyArgs,\n        FindFirstArgs: Prisma.${model.name}FindFirstArgs,\n        CreateArgs: Prisma.${model.name}CreateArgs,\n        CreateManyArgs: Prisma.${model.name}CreateManyArgs,\n        UpdateArgs: Prisma.${model.name}UpdateArgs,\n        UpdateManyArgs: Prisma.${model.name}UpdateManyArgs,\n        DeleteArgs: Prisma.${model.name}DeleteArgs,\n        DeleteManyArgs: Prisma.${model.name}DeleteManyArgs,\n        CountArgs: Prisma.${model.name}CountArgs\n    }\n`\n)}\n}\n\nexport type ExtractFilters<T> = T extends { where?: infer W; [x: string]: any } ? W : any;\nexport type ExtractQueryOptions<T, K extends keyof T = never> = Omit<T, K>;\nexport type ExtractData<T> = T extends { data: infer D; [x: string]: any } ? D : any;\n\nexport declare class BaseService<\n    TModelName extends keyof ModelsGetPayload<any>\n> {\n    modelName: TModelName;\n    relationFields: ModelGroupRelationFields;\n    prisma: PrismaClient;\n    \n    constructor(modelName: TModelName);\n    \n    createOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    createMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateManyArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    count<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CountArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['CountArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<number>;\n    \n    findMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindManyArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    findById<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        id: string | number, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    findOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    updateOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    updateMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateManyArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n    \n    deleteOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    deleteMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteManyArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteManyArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n}\n`;\n    execSync(\"npx prisma generate\", { stdio: \"inherit\" });\n\n    const filePath = path.resolve(\n        path.resolve(),\n        `../../../types/modules/base/base.service.d.ts`\n    );\n    fs.writeFileSync(filePath, content, {\n        encoding: \"utf8\",\n    });\n\n    sheu.done(\n        \"Types for @prisma/client and base service generated successfully!\"\n    );\n}\n"]}
+{"version":3,"file":"prisma-generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/prisma-generate.ts"],"names":[],"mappings":";;;;;AAOA,wCAsJC;AA7JD,0FAAgE;AAChE,wEAA2D;AAC3D,4CAAoB;AACpB,iDAAyC;AACzC,mDAA2B;AAC3B,gDAAwB;AAExB,SAAwB,qBAAqB;IACzC,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;EAoBlB,8BAAkB,CAAC,MAAM,CAAC,GAAG,CAC3B,CAAC,KAAK,EAAE,EAAE,CACN;OACD,IAAA,+BAAS,EAAC,KAAK,CAAC,IAAI,CAAC;2BACD,KAAK,CAAC,IAAI;6BACR,KAAK,CAAC,IAAI;+BACR,KAAK,CAAC,IAAI;gCACT,KAAK,CAAC,IAAI;6BACb,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;4BACf,KAAK,CAAC,IAAI;;CAErC,CACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiFA,CAAC;IACE,IAAA,wBAAQ,EAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtD,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CACzB,OAAO,CAAC,GAAG,EAAE,EACb,8BAA8B,CACjC,CAAC;IACF,YAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,YAAE,CAAC,aAAa,CAAC,QAAQ,GAAG,oBAAoB,EAAE,OAAO,EAAE;QACvD,QAAQ,EAAE,MAAM;KACnB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CACxB,OAAO,CAAC,GAAG,EAAE,EACb,0CAA0C,CAC7C,CAAC;IACF,MAAM,cAAc,GAAG;;;;;;;MAOrB,CAAC;IACH,YAAE,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE;QACtC,QAAQ,EAAE,MAAM;KACnB,CAAC,CAAC;IAEH,cAAI,CAAC,IAAI,CACL,mEAAmE,CACtE,CAAC;AACN,CAAC","sourcesContent":["import prismaSchemaParser from \"../prisma/prisma-schema-parser\";\nimport { kebabCase } from \"../helpers/change-case.helpers\";\nimport fs from \"fs\";\nimport { execSync } from \"child_process\";\nimport sheu from \"../sheu\";\nimport path from \"path\";\n\nexport default function prismaGenerateCommand() {\n    const content = `\nimport { ServiceBaseContext } from \"arkos/services\";\nimport { Prisma, PrismaClient } from \"@prisma/client\"\n\nexport interface PrismaField {\n  name: string;\n  type: string;\n  isOptional: boolean;\n  isArray: boolean;\n  foreignKeyField?: string;\n  foreignReferenceField?: string;\n  isRelation: boolean;\n  defaultValue?: any;\n  isId?: boolean;\n  isUnique?: boolean;\n  attributes: string[];\n}\n\n\nexport declare type ModelsGetPayload<T extends Record<string, any>> = {\n${prismaSchemaParser.models.map(\n    (model) =>\n        `\n    \"${kebabCase(model.name)}\": {\n        Delegate: Prisma.${model.name}Delegate,\n        GetPayload: Prisma.${model.name}GetPayload<T>,\n        FindManyArgs: Prisma.${model.name}FindManyArgs,\n        FindFirstArgs: Prisma.${model.name}FindFirstArgs,\n        CreateArgs: Prisma.${model.name}CreateArgs,\n        CreateManyArgs: Prisma.${model.name}CreateManyArgs,\n        UpdateArgs: Prisma.${model.name}UpdateArgs,\n        UpdateManyArgs: Prisma.${model.name}UpdateManyArgs,\n        DeleteArgs: Prisma.${model.name}DeleteArgs,\n        DeleteManyArgs: Prisma.${model.name}DeleteManyArgs,\n        CountArgs: Prisma.${model.name}CountArgs\n    }\n`\n)}\n}\n\nexport type ExtractFilters<T> = T extends { where?: infer W; [x: string]: any } ? W : any;\nexport type ExtractQueryOptions<T, K extends keyof T = never> = Omit<T, K>;\nexport type ExtractData<T> = T extends { data: infer D; [x: string]: any } ? D : any;\n\nexport declare class BaseService<\n    TModelName extends keyof ModelsGetPayload<any>\n> {\n    modelName: TModelName;\n    relationFields: {\n        singular: PrismaField[] | undefined;\n        list: PrismaField[] | undefined;\n    };\n    prisma: PrismaClient;\n    \n    constructor(modelName: TModelName);\n    \n    createOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    createMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateManyArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    count<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CountArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['CountArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<number>;\n    \n    findMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindManyArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    findById<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        id: string | number, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    findOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    updateOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    updateMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateManyArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n    \n    deleteOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    deleteMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteManyArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteManyArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n}\n`;\n    execSync(\"npx prisma generate\", { stdio: \"inherit\" });\n\n    const filePath = path.resolve(\n        process.cwd(),\n        `node_modules/@arkosjs/types/`\n    );\n    fs.mkdirSync(filePath, { recursive: true });\n    fs.writeFileSync(filePath + \"/base.service.d.ts\", content, {\n        encoding: \"utf8\",\n    });\n\n    const pkgPath = path.resolve(\n        process.cwd(),\n        `node_modules/@arkosjs/types/package.json`\n    );\n    const pkgJsonContent = `{\n      \"name\": \"@arkosjs/types\",\n      \"version\": \"1.0.0\",\n      \"types\": \"./base.service.d.ts\",\n      \"exports\": {\n        \"./base.service\": \"./base.service.d.ts\"\n      }\n    }`;\n    fs.writeFileSync(pkgPath, pkgJsonContent, {\n        encoding: \"utf8\",\n    });\n\n    sheu.done(\n        \"Types for @prisma/client and base service generated successfully!\"\n    );\n}\n"]}

package/dist/cjs/utils/cli/utils/cli.helpers.js

@@ -19,6 +19,6 @@ function killServerChildProcess() {
     (0, start_1.killProductionServerChildProcess)();
 }
 function getVersion() {
-    return "1.4.0-canary.87";
+    return "1.4.0-canary.89";
 }
 //# sourceMappingURL=cli.helpers.js.map

package/dist/esm/utils/cli/dev.js

@@ -25,6 +25,9 @@ export async function devCommand(options = {}) {
             console.error(`Could not find application entry point at ${entryPoint}`);
             process.exit(1);
         }
+        const baseServiceTypesPath = path.resolve(process.cwd(), `node_modules/@arkos/types/base.service.ts`);
+        if (fileExt === "ts" && !fs.existsSync(baseServiceTypesPath))
+            throw Error('Missing BaseService types please run "npx arkos prisma generate" to generate and sync the types from @prisma/client, see more at https://www.arkosjs.com/docs/cli/built-in-cli#typescript-types-generation.');
         const getEnv = () => ({
             NODE_ENV: "development",
             ...process.env,
@@ -133,7 +136,8 @@ export async function devCommand(options = {}) {
         });
     }
     catch (error) {
-        console.error("Development server failed to start:", error);
+        sheu.error("Development server failed to start:");
+        console.error(error);
         if (child) {
             child?.kill?.();
             child = null;

package/dist/esm/utils/cli/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/utils/cli/dev.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, ChildProcess } from \"child_process\";\nimport chokidar from \"chokidar\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport sheu from \"../sheu\";\nimport portAndHostAllocator from \"../features/port-and-host-allocator\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\n\ninterface DevOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Dev server command for the arkos CLI\n */\nexport async function devCommand(options: DevOptions = {}) {\n  if (process.env.NODE_ENV === \"test\" || !process.env.NODE_ENV)\n    process.env.NODE_ENV = \"development\";\n  envFiles = loadEnvironmentVariables();\n  child = null;\n  let restartTimeout: NodeJS.Timeout | null = null;\n\n  try {\n    const { port, host } = options;\n    let isRestarting = false;\n    let restartingFiles = new Set<string>();\n\n    const fileExt = getUserFileExtension();\n    const entryPoint = path.resolve(process.cwd(), `src/app.${fileExt}`);\n\n    if (!fs.existsSync(entryPoint)) {\n      console.error(`Could not find application entry point at ${entryPoint}`);\n      process.exit(1);\n    }\n\n    const getEnv = () =>\n      ({\n        NODE_ENV: \"development\",\n        ...process.env,\n        ...(port && { CLI_PORT: port }),\n        ...(host && { CLI_HOST: host }),\n        CLI: \"false\",\n      }) as { [x: string]: string };\n\n    const startServer = () => {\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      const env = getEnv();\n\n      if (fileExt === \"ts\") {\n        child = spawn(\"npx\", [\"tsx-strict\", \"--watch\", entryPoint], {\n          stdio: \"inherit\",\n          env,\n          shell: true,\n        });\n      } else {\n        child = spawn(\n          \"npx\",\n          [\"tsx-strict\", \"--no-type-check\", \"--watch\", entryPoint],\n          {\n            stdio: \"inherit\",\n            env,\n            shell: true,\n          }\n        );\n      }\n\n      if (child) {\n        child.on(\"error\", (error) => {\n          console.error(\"Failed to start server:\", error);\n        });\n\n        child.on(\"exit\", (code, signal) => {\n          if (!isRestarting && signal !== \"SIGTERM\" && signal !== \"SIGINT\") {\n            console.info(`Server exited with code ${code}, restarting...`);\n            startServer();\n          }\n        });\n      }\n    };\n\n    const scheduleRestart = (reason: string, filePath?: string) => {\n      if (filePath) restartingFiles.add(filePath);\n\n      if (restartTimeout) clearTimeout(restartTimeout);\n      const now = new Date();\n      const time = now.toTimeString().split(\" \")[0];\n\n      isRestarting = true;\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      restartTimeout = setTimeout(() => {\n        sheu.info(`\\x1b[90m${time}\\x1b[0m Restarting: ${reason.toLowerCase()}`);\n        startServer();\n        isRestarting = false;\n        restartTimeout = null;\n        if (filePath) restartingFiles.delete(filePath);\n      }, 1000);\n    };\n\n    const setupEnvWatcher = () => {\n      const envWatcher = chokidar.watch(\n        fullCleanCwd(envFiles?.join(\",\") || \"\")\n          .replaceAll(\"/\", \"\")\n          .split(\",\") || [],\n        {\n          ignoreInitial: true,\n          persistent: true,\n        }\n      );\n\n      envWatcher.on(\"all\", (_, filePath) => {\n        try {\n          envFiles = loadEnvironmentVariables();\n          scheduleRestart(\"Environment files changed\", \"env-files\");\n        } catch (error) {\n          console.error(`Error reloading ${filePath}:`, error);\n        }\n      });\n\n      return envWatcher;\n    };\n\n    startServer();\n\n    const envWatcher = setupEnvWatcher();\n\n    const env = getEnv();\n    const hostAndPort = await portAndHostAllocator.getHostAndAvailablePort(\n      env,\n      { logWarning: true }\n    );\n\n    watermarkStamper.stamp({\n      ...hostAndPort,\n      envFiles,\n    });\n\n    const cleanup = () => {\n      if (restartTimeout) clearTimeout(restartTimeout);\n\n      if (envWatcher) envWatcher.close();\n\n      if (child) {\n        child.kill(\"SIGTERM\");\n\n        setTimeout(() => {\n          if (child && !child.killed) child.kill(\"SIGKILL\");\n        }, 5000);\n      }\n\n      process.exit(0);\n    };\n\n    process.on(\"SIGINT\", cleanup);\n    process.on(\"SIGTERM\", cleanup);\n\n    process.on(\"uncaughtException\", (error) => {\n      console.error(\"Uncaught Exception:\", error);\n      cleanup();\n    });\n  } catch (error) {\n    console.error(\"Development server failed to start:\", error);\n\n    if (child) {\n      (child as ChildProcess)?.kill?.();\n      child = null;\n    }\n\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the development server child process\n */\nexport function killDevelopmentServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\n}\n"]}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/utils/cli/dev.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, ChildProcess } from \"child_process\";\nimport chokidar from \"chokidar\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport sheu from \"../sheu\";\nimport portAndHostAllocator from \"../features/port-and-host-allocator\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\n\ninterface DevOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Dev server command for the arkos CLI\n */\nexport async function devCommand(options: DevOptions = {}) {\n  if (process.env.NODE_ENV === \"test\" || !process.env.NODE_ENV)\n    process.env.NODE_ENV = \"development\";\n  envFiles = loadEnvironmentVariables();\n  child = null;\n  let restartTimeout: NodeJS.Timeout | null = null;\n\n  try {\n    const { port, host } = options;\n    let isRestarting = false;\n    let restartingFiles = new Set<string>();\n\n    const fileExt = getUserFileExtension();\n    const entryPoint = path.resolve(process.cwd(), `src/app.${fileExt}`);\n\n    if (!fs.existsSync(entryPoint)) {\n      console.error(`Could not find application entry point at ${entryPoint}`);\n      process.exit(1);\n    }\n\n    const baseServiceTypesPath = path.resolve(\n      process.cwd(),\n      `node_modules/@arkos/types/base.service.ts`\n    );\n    if (fileExt === \"ts\" && !fs.existsSync(baseServiceTypesPath))\n      throw Error(\n        'Missing BaseService types please run \"npx arkos prisma generate\" to generate and sync the types from @prisma/client, see more at https://www.arkosjs.com/docs/cli/built-in-cli#typescript-types-generation.'\n      );\n\n    const getEnv = () =>\n      ({\n        NODE_ENV: \"development\",\n        ...process.env,\n        ...(port && { CLI_PORT: port }),\n        ...(host && { CLI_HOST: host }),\n        CLI: \"false\",\n      }) as { [x: string]: string };\n\n    const startServer = () => {\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      const env = getEnv();\n\n      if (fileExt === \"ts\") {\n        child = spawn(\"npx\", [\"tsx-strict\", \"--watch\", entryPoint], {\n          stdio: \"inherit\",\n          env,\n          shell: true,\n        });\n      } else {\n        child = spawn(\n          \"npx\",\n          [\"tsx-strict\", \"--no-type-check\", \"--watch\", entryPoint],\n          {\n            stdio: \"inherit\",\n            env,\n            shell: true,\n          }\n        );\n      }\n\n      if (child) {\n        child.on(\"error\", (error) => {\n          console.error(\"Failed to start server:\", error);\n        });\n\n        child.on(\"exit\", (code, signal) => {\n          if (!isRestarting && signal !== \"SIGTERM\" && signal !== \"SIGINT\") {\n            console.info(`Server exited with code ${code}, restarting...`);\n            startServer();\n          }\n        });\n      }\n    };\n\n    const scheduleRestart = (reason: string, filePath?: string) => {\n      if (filePath) restartingFiles.add(filePath);\n\n      if (restartTimeout) clearTimeout(restartTimeout);\n      const now = new Date();\n      const time = now.toTimeString().split(\" \")[0];\n\n      isRestarting = true;\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      restartTimeout = setTimeout(() => {\n        sheu.info(`\\x1b[90m${time}\\x1b[0m Restarting: ${reason.toLowerCase()}`);\n        startServer();\n        isRestarting = false;\n        restartTimeout = null;\n        if (filePath) restartingFiles.delete(filePath);\n      }, 1000);\n    };\n\n    const setupEnvWatcher = () => {\n      const envWatcher = chokidar.watch(\n        fullCleanCwd(envFiles?.join(\",\") || \"\")\n          .replaceAll(\"/\", \"\")\n          .split(\",\") || [],\n        {\n          ignoreInitial: true,\n          persistent: true,\n        }\n      );\n\n      envWatcher.on(\"all\", (_, filePath) => {\n        try {\n          envFiles = loadEnvironmentVariables();\n          scheduleRestart(\"Environment files changed\", \"env-files\");\n        } catch (error) {\n          console.error(`Error reloading ${filePath}:`, error);\n        }\n      });\n\n      return envWatcher;\n    };\n\n    startServer();\n\n    const envWatcher = setupEnvWatcher();\n\n    const env = getEnv();\n    const hostAndPort = await portAndHostAllocator.getHostAndAvailablePort(\n      env,\n      { logWarning: true }\n    );\n\n    watermarkStamper.stamp({\n      ...hostAndPort,\n      envFiles,\n    });\n\n    const cleanup = () => {\n      if (restartTimeout) clearTimeout(restartTimeout);\n\n      if (envWatcher) envWatcher.close();\n\n      if (child) {\n        child.kill(\"SIGTERM\");\n\n        setTimeout(() => {\n          if (child && !child.killed) child.kill(\"SIGKILL\");\n        }, 5000);\n      }\n\n      process.exit(0);\n    };\n\n    process.on(\"SIGINT\", cleanup);\n    process.on(\"SIGTERM\", cleanup);\n\n    process.on(\"uncaughtException\", (error) => {\n      console.error(\"Uncaught Exception:\", error);\n      cleanup();\n    });\n  } catch (error) {\n    sheu.error(\"Development server failed to start:\");\n    console.error(error);\n\n    if (child) {\n      (child as ChildProcess)?.kill?.();\n      child = null;\n    }\n\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the development server child process\n */\nexport function killDevelopmentServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\n}\n"]}

package/dist/esm/utils/cli/prisma-generate.js

@@ -6,10 +6,24 @@ import sheu from "../sheu.js";
 import path from "path";
 export default function prismaGenerateCommand() {
     const content = `
-import { ModelGroupRelationFields } from "./utils/helpers/base.service.helpers.js";
-import { ServiceBaseContext } from "./types/base.service.types.js";
+import { ServiceBaseContext } from "arkos/services";
 import { Prisma, PrismaClient } from "@prisma/client"
 
+export interface PrismaField {
+  name: string;
+  type: string;
+  isOptional: boolean;
+  isArray: boolean;
+  foreignKeyField?: string;
+  foreignReferenceField?: string;
+  isRelation: boolean;
+  defaultValue?: any;
+  isId?: boolean;
+  isUnique?: boolean;
+  attributes: string[];
+}
+
+
 export declare type ModelsGetPayload<T extends Record<string, any>> = {
 ${prismaSchemaParser.models.map((model) => `
     "${kebabCase(model.name)}": {
@@ -36,7 +50,10 @@ export declare class BaseService<
     TModelName extends keyof ModelsGetPayload<any>
 > {
     modelName: TModelName;
-    relationFields: ModelGroupRelationFields;
+    relationFields: {
+        singular: PrismaField[] | undefined;
+        list: PrismaField[] | undefined;
+    };
     prisma: PrismaClient;
     
     constructor(modelName: TModelName);
@@ -105,8 +122,21 @@ export declare class BaseService<
 }
 `;
     execSync("npx prisma generate", { stdio: "inherit" });
-    const filePath = path.resolve(path.resolve(), `../../../types/modules/base/base.service.d.ts`);
-    fs.writeFileSync(filePath, content, {
+    const filePath = path.resolve(process.cwd(), `node_modules/@arkosjs/types/`);
+    fs.mkdirSync(filePath, { recursive: true });
+    fs.writeFileSync(filePath + "/base.service.d.ts", content, {
+        encoding: "utf8",
+    });
+    const pkgPath = path.resolve(process.cwd(), `node_modules/@arkosjs/types/package.json`);
+    const pkgJsonContent = `{
+      "name": "@arkosjs/types",
+      "version": "1.0.0",
+      "types": "./base.service.d.ts",
+      "exports": {
+        "./base.service": "./base.service.d.ts"
+      }
+    }`;
+    fs.writeFileSync(pkgPath, pkgJsonContent, {
         encoding: "utf8",
     });
     sheu.done("Types for @prisma/client and base service generated successfully!");

package/dist/esm/utils/cli/prisma-generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"prisma-generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/prisma-generate.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,MAAM,CAAC,OAAO,UAAU,qBAAqB;IACzC,MAAM,OAAO,GAAG;;;;;;EAMlB,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAC3B,CAAC,KAAK,EAAE,EAAE,CACN;OACD,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;2BACD,KAAK,CAAC,IAAI;6BACR,KAAK,CAAC,IAAI;+BACR,KAAK,CAAC,IAAI;gCACT,KAAK,CAAC,IAAI;6BACb,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;4BACf,KAAK,CAAC,IAAI;;CAErC,CACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8EA,CAAC;IACE,QAAQ,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CACzB,IAAI,CAAC,OAAO,EAAE,EACd,+CAA+C,CAClD,CAAC;IACF,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE;QAChC,QAAQ,EAAE,MAAM;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CACL,mEAAmE,CACtE,CAAC;AACN,CAAC","sourcesContent":["import prismaSchemaParser from \"../prisma/prisma-schema-parser\";\nimport { kebabCase } from \"../helpers/change-case.helpers\";\nimport fs from \"fs\";\nimport { execSync } from \"child_process\";\nimport sheu from \"../sheu\";\nimport path from \"path\";\nimport { fileURLToPath } from \"url\";\nimport { dirname } from \"path\";\n\nexport default function prismaGenerateCommand() {\n    const content = `\nimport { ModelGroupRelationFields } from \"./utils/helpers/base.service.helpers\";\nimport { ServiceBaseContext } from \"./types/base.service.types\";\nimport { Prisma, PrismaClient } from \"@prisma/client\"\n\nexport declare type ModelsGetPayload<T extends Record<string, any>> = {\n${prismaSchemaParser.models.map(\n    (model) =>\n        `\n    \"${kebabCase(model.name)}\": {\n        Delegate: Prisma.${model.name}Delegate,\n        GetPayload: Prisma.${model.name}GetPayload<T>,\n        FindManyArgs: Prisma.${model.name}FindManyArgs,\n        FindFirstArgs: Prisma.${model.name}FindFirstArgs,\n        CreateArgs: Prisma.${model.name}CreateArgs,\n        CreateManyArgs: Prisma.${model.name}CreateManyArgs,\n        UpdateArgs: Prisma.${model.name}UpdateArgs,\n        UpdateManyArgs: Prisma.${model.name}UpdateManyArgs,\n        DeleteArgs: Prisma.${model.name}DeleteArgs,\n        DeleteManyArgs: Prisma.${model.name}DeleteManyArgs,\n        CountArgs: Prisma.${model.name}CountArgs\n    }\n`\n)}\n}\n\nexport type ExtractFilters<T> = T extends { where?: infer W; [x: string]: any } ? W : any;\nexport type ExtractQueryOptions<T, K extends keyof T = never> = Omit<T, K>;\nexport type ExtractData<T> = T extends { data: infer D; [x: string]: any } ? D : any;\n\nexport declare class BaseService<\n    TModelName extends keyof ModelsGetPayload<any>\n> {\n    modelName: TModelName;\n    relationFields: ModelGroupRelationFields;\n    prisma: PrismaClient;\n    \n    constructor(modelName: TModelName);\n    \n    createOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    createMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateManyArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    count<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CountArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['CountArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<number>;\n    \n    findMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindManyArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    findById<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        id: string | number, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    findOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    updateOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    updateMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateManyArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n    \n    deleteOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    deleteMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteManyArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteManyArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n}\n`;\n    execSync(\"npx prisma generate\", { stdio: \"inherit\" });\n\n    const filePath = path.resolve(\n        path.resolve(),\n        `../../../types/modules/base/base.service.d.ts`\n    );\n    fs.writeFileSync(filePath, content, {\n        encoding: \"utf8\",\n    });\n\n    sheu.done(\n        \"Types for @prisma/client and base service generated successfully!\"\n    );\n}\n"]}
+{"version":3,"file":"prisma-generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/prisma-generate.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,qBAAqB;IACzC,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;EAoBlB,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAC3B,CAAC,KAAK,EAAE,EAAE,CACN;OACD,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;2BACD,KAAK,CAAC,IAAI;6BACR,KAAK,CAAC,IAAI;+BACR,KAAK,CAAC,IAAI;gCACT,KAAK,CAAC,IAAI;6BACb,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;6BACd,KAAK,CAAC,IAAI;iCACN,KAAK,CAAC,IAAI;4BACf,KAAK,CAAC,IAAI;;CAErC,CACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiFA,CAAC;IACE,QAAQ,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CACzB,OAAO,CAAC,GAAG,EAAE,EACb,8BAA8B,CACjC,CAAC;IACF,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,EAAE,CAAC,aAAa,CAAC,QAAQ,GAAG,oBAAoB,EAAE,OAAO,EAAE;QACvD,QAAQ,EAAE,MAAM;KACnB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CACxB,OAAO,CAAC,GAAG,EAAE,EACb,0CAA0C,CAC7C,CAAC;IACF,MAAM,cAAc,GAAG;;;;;;;MAOrB,CAAC;IACH,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE;QACtC,QAAQ,EAAE,MAAM;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CACL,mEAAmE,CACtE,CAAC;AACN,CAAC","sourcesContent":["import prismaSchemaParser from \"../prisma/prisma-schema-parser\";\nimport { kebabCase } from \"../helpers/change-case.helpers\";\nimport fs from \"fs\";\nimport { execSync } from \"child_process\";\nimport sheu from \"../sheu\";\nimport path from \"path\";\n\nexport default function prismaGenerateCommand() {\n    const content = `\nimport { ServiceBaseContext } from \"arkos/services\";\nimport { Prisma, PrismaClient } from \"@prisma/client\"\n\nexport interface PrismaField {\n  name: string;\n  type: string;\n  isOptional: boolean;\n  isArray: boolean;\n  foreignKeyField?: string;\n  foreignReferenceField?: string;\n  isRelation: boolean;\n  defaultValue?: any;\n  isId?: boolean;\n  isUnique?: boolean;\n  attributes: string[];\n}\n\n\nexport declare type ModelsGetPayload<T extends Record<string, any>> = {\n${prismaSchemaParser.models.map(\n    (model) =>\n        `\n    \"${kebabCase(model.name)}\": {\n        Delegate: Prisma.${model.name}Delegate,\n        GetPayload: Prisma.${model.name}GetPayload<T>,\n        FindManyArgs: Prisma.${model.name}FindManyArgs,\n        FindFirstArgs: Prisma.${model.name}FindFirstArgs,\n        CreateArgs: Prisma.${model.name}CreateArgs,\n        CreateManyArgs: Prisma.${model.name}CreateManyArgs,\n        UpdateArgs: Prisma.${model.name}UpdateArgs,\n        UpdateManyArgs: Prisma.${model.name}UpdateManyArgs,\n        DeleteArgs: Prisma.${model.name}DeleteArgs,\n        DeleteManyArgs: Prisma.${model.name}DeleteManyArgs,\n        CountArgs: Prisma.${model.name}CountArgs\n    }\n`\n)}\n}\n\nexport type ExtractFilters<T> = T extends { where?: infer W; [x: string]: any } ? W : any;\nexport type ExtractQueryOptions<T, K extends keyof T = never> = Omit<T, K>;\nexport type ExtractData<T> = T extends { data: infer D; [x: string]: any } ? D : any;\n\nexport declare class BaseService<\n    TModelName extends keyof ModelsGetPayload<any>\n> {\n    modelName: TModelName;\n    relationFields: {\n        singular: PrismaField[] | undefined;\n        list: PrismaField[] | undefined;\n    };\n    prisma: PrismaClient;\n    \n    constructor(modelName: TModelName);\n    \n    createOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    createMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CreateManyArgs'], 'data'>>(\n        data: ExtractData<ModelsGetPayload<any>[TModelName]['CreateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    count<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['CountArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['CountArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<number>;\n    \n    findMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindManyArgs'], 'where'>>(\n        filters?: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'][]>;\n    \n    findById<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        id: string | number, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    findOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['FindFirstArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['FindManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload'] | null>;\n    \n    updateOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    updateMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['UpdateManyArgs'], 'where' | 'data'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        data: ExtractData<ModelsGetPayload<any>[TModelName]['UpdateManyArgs']>, \n        queryOptions?: TOptions, \n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n    \n    deleteOne<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<ModelsGetPayload<TOptions>[TModelName]['GetPayload']>;\n    \n    deleteMany<TOptions extends ExtractQueryOptions<ModelsGetPayload<any>[TModelName]['DeleteManyArgs'], 'where'>>(\n        filters: ExtractFilters<ModelsGetPayload<any>[TModelName]['DeleteManyArgs']>, \n        queryOptions?: TOptions,\n        context?: ServiceBaseContext\n    ): Promise<{ count: number }>;\n}\n`;\n    execSync(\"npx prisma generate\", { stdio: \"inherit\" });\n\n    const filePath = path.resolve(\n        process.cwd(),\n        `node_modules/@arkosjs/types/`\n    );\n    fs.mkdirSync(filePath, { recursive: true });\n    fs.writeFileSync(filePath + \"/base.service.d.ts\", content, {\n        encoding: \"utf8\",\n    });\n\n    const pkgPath = path.resolve(\n        process.cwd(),\n        `node_modules/@arkosjs/types/package.json`\n    );\n    const pkgJsonContent = `{\n      \"name\": \"@arkosjs/types\",\n      \"version\": \"1.0.0\",\n      \"types\": \"./base.service.d.ts\",\n      \"exports\": {\n        \"./base.service\": \"./base.service.d.ts\"\n      }\n    }`;\n    fs.writeFileSync(pkgPath, pkgJsonContent, {\n        encoding: \"utf8\",\n    });\n\n    sheu.done(\n        \"Types for @prisma/client and base service generated successfully!\"\n    );\n}\n"]}

package/dist/esm/utils/cli/utils/cli.helpers.js

@@ -11,6 +11,6 @@ export function killServerChildProcess() {
     killProductionServerChildProcess();
 }
 export function getVersion() {
-    return "1.4.0-canary.87";
+    return "1.4.0-canary.89";
 }
 //# sourceMappingURL=cli.helpers.js.map

package/dist/types/modules/base/base.service.d.ts

@@ -1,37 +1,5 @@
-import { ModelGroupRelationFields } from "./utils/helpers/base.service.helpers";
-import { ModelDelegate, CreateOneData, CreateOneOptions, CreateOneResult, CreateManyData, CreateManyOptions, CreateManyResult, CountFilters, FindManyFilters, FindManyOptions, FindManyResult, FindByIdOptions, FindByIdResult, FindOneFilters, FindOneOptions, FindOneResult, UpdateOneFilters, UpdateOneData, UpdateOneOptions, UpdateOneResult, UpdateManyFilters, UpdateManyData, UpdateManyOptions, UpdateManyResult, DeleteOneFilters, DeleteOneResult, DeleteManyFilters, DeleteManyResult, ServiceBaseContext } from "./types/base.service.types";
-export interface ServiceOperationHooks {
-    beforeOperation?: (params: any) => void | Promise<void>;
-    afterOperation?: (result: any, params: any) => void | Promise<void>;
-    beforePrisma?: (prismaArgs: any, params: any) => any | Promise<any>;
-    afterPrisma?: (result: any, params: any) => any | Promise<any>;
-}
-export declare class BaseService<T extends ModelDelegate = any> {
-    modelName: string;
-    relationFields: ModelGroupRelationFields;
-    prisma: any;
-    constructor(modelName: string);
-    private executeOperation;
-    private executeTransactionOperation;
-    private executeHooks;
-    private buildHookParams;
-    private buildTransactionHookParams;
-    private handlePasswordHashing;
-    private processRelationFieldsInBody;
-    private buildPrismaArgs;
-    private executeTransactionLogic;
-    private shouldHashPassword;
-    private processPasswordHashing;
-    createOne<TOptions extends CreateOneOptions<T>>(data: CreateOneData<T>, queryOptions?: TOptions, context?: ServiceBaseContext): Promise<CreateOneResult<T>>;
-    createMany<TOptions extends CreateManyOptions<T>>(data: CreateManyData<T>, queryOptions?: TOptions, context?: ServiceBaseContext): Promise<CreateManyResult<T>>;
-    count(filters?: CountFilters<T>, context?: ServiceBaseContext): Promise<number>;
-    findMany<TOptions extends FindManyOptions<T>>(filters?: FindManyFilters<T>, queryOptions?: TOptions, context?: ServiceBaseContext): Promise<FindManyResult<T, TOptions>>;
-    findById<TOptions extends FindByIdOptions<T>>(id: string | number, queryOptions?: TOptions, context?: ServiceBaseContext): Promise<FindByIdResult<T>>;
-    findOne<TOptions extends FindOneOptions<T>>(filters: FindOneFilters<T>, queryOptions?: TOptions, context?: ServiceBaseContext): Promise<FindOneResult<T>>;
-    updateOne<TOptions extends UpdateOneOptions<T>>(filters: UpdateOneFilters<T>, data: UpdateOneData<T>, queryOptions?: TOptions, context?: ServiceBaseContext): Promise<UpdateOneResult<T>>;
-    updateMany<TOptions extends UpdateManyOptions<T>>(filters: UpdateManyFilters<T>, data: UpdateManyData<T>, queryOptions?: TOptions, context?: ServiceBaseContext): Promise<UpdateManyResult<T>>;
-    deleteOne(filters: DeleteOneFilters<T>, context?: ServiceBaseContext): Promise<DeleteOneResult<T>>;
-    deleteMany(filters: DeleteManyFilters<T>, context?: ServiceBaseContext): Promise<DeleteManyResult<T>>;
-    batchUpdate<TOptions extends UpdateOneOptions<T>>(dataArray: UpdateOneData<T>[], queryOptions?: TOptions, context?: ServiceBaseContext): Promise<Array<UpdateOneResult<T>>>;
-    batchDelete(batchFilters: Array<DeleteOneFilters<T>>, context?: ServiceBaseContext): Promise<Array<DeleteOneResult<T>>>;
-}
+// Auto-generated: imports from locally generated types
+import { BaseService } from '@arkosjs/types/base.service';
+
+export { BaseService };
+export type * from '@arkosjs/types/base.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkos",
-  "version": "1.4.0-canary.87",
+  "version": "1.4.0-canary.89",
   "description": "The Express & Prisma RESTful Framework",
   "main": "dist/cjs/exports/index.js",
   "module": "dist/esm/exports/index.js",