@cedarjs/cli-helpers 6.0.0-canary.2771 → 6.0.0-canary.2773

package/dist/lib/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAkDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAmCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAStC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAkDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAmCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}

package/dist/lib/project.js

@@ -23,7 +23,8 @@ const isTypeScriptProject = () => {
 };
 const getInstalledRedwoodVersion = () => {
   try {
-    const packageJson = require("../../package.json");
+    const packageJsonPath = path.join(import.meta.dirname, "../../package.json");
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
     return packageJson.version;
   } catch {
     console.error(colors.error("Could not find installed Cedar version"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli-helpers",
-  "version": "6.0.0-canary.2771",
+  "version": "6.0.0-canary.2773",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -10,83 +10,51 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
+      "default": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
-      },
-      "default": {
-        "types": "./dist/cjs/index.d.ts",
-        "default": "./dist/cjs/index.js"
       }
     },
     "./loadEnvFiles": {
-      "import": {
+      "default": {
         "types": "./dist/lib/loadEnvFiles.d.ts",
         "default": "./dist/lib/loadEnvFiles.js"
-      },
-      "default": {
-        "types": "./dist/cjs/lib/loadEnvFiles.d.ts",
-        "default": "./dist/cjs/lib/loadEnvFiles.js"
       }
     },
     "./dist/lib/loadEnvFiles.js": {
-      "import": {
+      "default": {
         "types": "./dist/lib/loadEnvFiles.d.ts",
         "default": "./dist/lib/loadEnvFiles.js"
-      },
-      "default": {
-        "types": "./dist/cjs/lib/loadEnvFiles.d.ts",
-        "default": "./dist/cjs/lib/loadEnvFiles.js"
       }
     },
     "./packageManager": {
-      "import": {
+      "default": {
         "types": "./dist/packageManager/index.d.ts",
         "default": "./dist/packageManager/index.js"
-      },
-      "default": {
-        "types": "./dist/cjs/packageManager/index.d.ts",
-        "default": "./dist/cjs/packageManager/index.js"
       }
     },
     "./packageManager/exec": {
-      "import": {
+      "default": {
         "types": "./dist/packageManager/exec.d.ts",
         "default": "./dist/packageManager/exec.js"
-      },
-      "default": {
-        "types": "./dist/cjs/packageManager/exec.d.ts",
-        "default": "./dist/cjs/packageManager/exec.js"
       }
     },
     "./packageManager/packages": {
-      "import": {
+      "default": {
         "types": "./dist/packageManager/packages.d.ts",
         "default": "./dist/packageManager/packages.js"
-      },
-      "default": {
-        "types": "./dist/cjs/packageManager/packages.d.ts",
-        "default": "./dist/cjs/packageManager/packages.js"
       }
     },
     "./packageManager/display": {
-      "import": {
+      "default": {
         "types": "./dist/packageManager/display.d.ts",
         "default": "./dist/packageManager/display.js"
-      },
-      "default": {
-        "types": "./dist/cjs/packageManager/display.d.ts",
-        "default": "./dist/cjs/packageManager/display.js"
       }
     },
     "./packageManager/workspaces": {
-      "import": {
+      "default": {
         "types": "./dist/packageManager/workspaces.d.ts",
         "default": "./dist/packageManager/workspaces.js"
-      },
-      "default": {
-        "types": "./dist/cjs/packageManager/workspaces.d.ts",
-        "default": "./dist/cjs/packageManager/workspaces.js"
       }
     }
   },
@@ -95,9 +63,9 @@
     "dist"
   ],
   "scripts": {
-    "build": "node ./build.ts && yarn build:types",
+    "build": "node ./build.ts",
     "build:pack": "yarn pack -o cedarjs-cli-helpers.tgz",
-    "build:types": "tsc --build --verbose ./tsconfig.build.json ./tsconfig.cjs.json",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx\" --ignore dist --exec \"yarn build\"",
     "prepublishOnly": "NODE_ENV=production yarn build",
     "test": "vitest run",
@@ -105,8 +73,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@cedarjs/project-config": "6.0.0-canary.2771",
-    "@cedarjs/telemetry": "6.0.0-canary.2771",
+    "@cedarjs/project-config": "6.0.0-canary.2773",
+    "@cedarjs/telemetry": "6.0.0-canary.2773",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "ansis": "4.3.1",
@@ -125,7 +93,7 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2771",
+    "@cedarjs/framework-tools": "6.0.0-canary.2773",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/lodash": "4.17.24",
     "@types/pascalcase": "1.0.3",

package/dist/cjs/auth/authFiles.d.ts

@@ -1,44 +0,0 @@
-interface FilesArgs {
-    basedir: string;
-    webAuthn: boolean;
-}
-/**
- * Get the api side file paths and file contents to write
- *
- * Example return value:
- * ```json
- * {
- *   "/Users/tobbe/dev/rw-app/api/src/lib/auth.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/lib/helperFunctions.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/functions/auth.ts": "<file content>"
- * }
- * ```
- */
-export declare const apiSideFiles: ({ basedir, webAuthn }: FilesArgs) => Promise<Record<string, string>>;
-/**
- * Loops through the keys in `filesRecord` and generates unique file paths if
- * they conflict with existing files
- *
- * Given this input:
- * ```json
- * {
- *   "/Users/tobbe/dev/rw-app/api/src/lib/auth.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/lib/helperFunctions.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/lib/supertokens.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/functions/auth.ts": "<file content>"
- * }
- * ```
- *
- * You could get this output, depending on what existing files there are
- * ```json
- * {
- *   "/Users/tobbe/dev/rw-app/api/src/lib/supertokensAuth3.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/lib/supertokensHelperFunctions.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/lib/supertokens2.ts": "<file content>",
- *   "/Users/tobbe/dev/rw-app/api/src/functions/auth.ts": "<file content>"
- * }
- * ```
- */
-export declare function generateUniqueFileNames(filesRecord: Record<string, string>, provider: string): Record<string, string>;
-export {};
-//# sourceMappingURL=authFiles.d.ts.map

package/dist/cjs/auth/authFiles.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"authFiles.d.ts","sourceRoot":"","sources":["../../../src/auth/authFiles.ts"],"names":[],"mappings":"AASA,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GAAU,uBAAuB,SAAS,oCAmElE,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,QAAQ,EAAE,MAAM,0BAwCjB"}

package/dist/cjs/auth/authFiles.js

@@ -1,109 +0,0 @@
-"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 authFiles_exports = {};
-__export(authFiles_exports, {
-  apiSideFiles: () => apiSideFiles,
-  generateUniqueFileNames: () => generateUniqueFileNames
-});
-module.exports = __toCommonJS(authFiles_exports);
-var import_node_fs = __toESM(require("node:fs"), 1);
-var import_path = __toESM(require("path"), 1);
-var import_pascalcase = __toESM(require("pascalcase"), 1);
-var import_lib = require("../lib/index.js");
-var import_paths = require("../lib/paths.js");
-var import_project = require("../lib/project.js");
-const apiSideFiles = async ({ basedir, webAuthn }) => {
-  const apiSrcPath = (0, import_paths.getPaths)().api.src;
-  const apiBaseTemplatePath = import_path.default.join(basedir, "templates", "api");
-  const templateDirectories = import_node_fs.default.readdirSync(apiBaseTemplatePath);
-  let filesRecord = {};
-  for (const dir of templateDirectories) {
-    const templateFiles = import_node_fs.default.readdirSync(import_path.default.join(apiBaseTemplatePath, dir));
-    const filePaths = templateFiles.filter((fileName) => {
-      const fileNameParts = fileName.split(".");
-      return fileNameParts.length <= 3 || fileNameParts.at(-3) !== "webAuthn";
-    }).map((fileName) => {
-      let outputFileName = fileName.replace(/\.template$/, "");
-      if (!(0, import_project.isTypeScriptProject)()) {
-        outputFileName = outputFileName.replace(/\.ts(x?)$/, ".js$1");
-      }
-      if (!webAuthn) {
-        return { templateFileName: fileName, outputFileName };
-      }
-      const webAuthnFileName = fileName.split(".").reverse().map((part, i) => i === 1 ? "webAuthn." + part : part).reverse().join(".");
-      if (templateFiles.includes(webAuthnFileName)) {
-        return { templateFileName: webAuthnFileName, outputFileName };
-      } else {
-        return { templateFileName: fileName, outputFileName };
-      }
-    }).map((f) => {
-      const templateFilePath = import_path.default.join(
-        apiBaseTemplatePath,
-        dir,
-        f.templateFileName
-      );
-      const outputFilePath = import_path.default.join(apiSrcPath, dir, f.outputFileName);
-      return { templateFilePath, outputFilePath };
-    });
-    for (const paths of filePaths) {
-      const content = import_node_fs.default.readFileSync(paths.templateFilePath, "utf8");
-      filesRecord = {
-        ...filesRecord,
-        [paths.outputFilePath]: (0, import_project.isTypeScriptProject)() ? content : await (0, import_lib.transformTSToJS)(paths.outputFilePath, content)
-      };
-    }
-  }
-  return filesRecord;
-};
-function generateUniqueFileNames(filesRecord, provider) {
-  const newFilesRecord = {};
-  Object.keys(filesRecord).forEach((fullPath) => {
-    let newFullPath = fullPath;
-    let i = 1;
-    while (import_node_fs.default.existsSync(newFullPath)) {
-      const nameParts = import_path.default.basename(fullPath).split(".");
-      if (nameParts[0] === provider) {
-        const newFileName = provider + (i + 1) + "." + nameParts.slice(1).join(".");
-        newFullPath = import_path.default.join(import_path.default.dirname(fullPath), newFileName);
-      } else {
-        const count = i > 1 ? i : "";
-        const newFileName = provider + (0, import_pascalcase.default)(nameParts[0]) + count + "." + nameParts.slice(1).join(".");
-        newFullPath = import_path.default.join(import_path.default.dirname(fullPath), newFileName);
-      }
-      i++;
-    }
-    newFilesRecord[newFullPath] = filesRecord[fullPath];
-  });
-  return newFilesRecord;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  apiSideFiles,
-  generateUniqueFileNames
-});

package/dist/cjs/auth/authTasks.d.ts

@@ -1,49 +0,0 @@
-import type { ListrRenderer, ListrTask, ListrTaskWrapper } from 'listr2';
-export declare const getWebAppPath: () => string;
-export declare const addApiConfig: ({ replaceExistingImport, authDecoderImport, }: {
-    replaceExistingImport: boolean;
-    authDecoderImport?: string;
-}) => void;
-export declare const hasAuthProvider: (content: string) => boolean;
-/**
- * Removes <AuthProvider ...> and </AuthProvider> if they exist, and un-indents
- * the content.
- *
- * Exported for testing
- */
-export declare const removeAuthProvider: (content: string) => string;
-/**
- * Actually inserts the required config lines into App.{jsx,tsx}
- * Exported for testing
- */
-export declare const addConfigToWebApp: <Renderer extends typeof ListrRenderer>() => ListrTask<AuthGeneratorCtx, Renderer>;
-export declare const createWebAuth: (basedir: string, webAuthn: boolean) => {
-    title: string;
-    task: (ctx: AuthGeneratorCtx) => Promise<void>;
-};
-export declare const addConfigToRoutes: () => {
-    title: string;
-    task: () => void;
-};
-/**
- * Will find the templates inside `${basedir}/templates/api`,
- * and write these files to disk with unique names if they are clashing.
- *
- * @returns Listr task
- */
-export declare const generateAuthApiFiles: <Renderer extends typeof ListrRenderer>(basedir: string, webAuthn: boolean) => ListrTask<AuthGeneratorCtx, Renderer>;
-export declare const addAuthConfigToGqlApi: <Renderer extends typeof ListrRenderer, FallbackRenderer extends typeof ListrRenderer>(authDecoderImport?: string) => {
-    title: string;
-    task: (ctx: AuthGeneratorCtx, _task: ListrTaskWrapper<AuthGeneratorCtx, Renderer, FallbackRenderer>) => void;
-};
-export type AuthSetupMode = 'FORCE' | 'REPLACE' | 'COMBINE' | 'UNKNOWN';
-export interface AuthGeneratorCtx {
-    setupMode: AuthSetupMode;
-    provider: string;
-    force: boolean;
-}
-export declare const setAuthSetupMode: <Renderer extends typeof ListrRenderer, FallbackRenderer extends typeof ListrRenderer>(force: boolean) => {
-    title: string;
-    task: (ctx: AuthGeneratorCtx, task: ListrTaskWrapper<AuthGeneratorCtx, Renderer, FallbackRenderer>) => Promise<void>;
-};
-//# sourceMappingURL=authTasks.d.ts.map

package/dist/cjs/auth/authTasks.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AA2BxE,eAAO,MAAM,aAAa,cAA2B,CAAA;AAwDrD,eAAO,MAAM,YAAY,GAAI,+CAG1B;IACD,qBAAqB,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,SAgDA,CAAA;AAmCD,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,YAE9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,WA6CjD,CAAA;AAoED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,SAAS,OAAO,aAAa,OAClC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CA8CxC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,UAAU,OAAO;;gBAgC1C,gBAAgB;CA0CrC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAmB7B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,OAAO,aAAa,EACxE,SAAS,MAAM,EACf,UAAU,OAAO,KAChB,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAgDtC,CAAA;AASD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,oBAAoB,MAAM;;gBAInB,gBAAgB,SACd,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAcvE,CAAA;AAEF,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,OAAO,OAAO;;gBAKL,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CA2CzE,CAAA"}