@idevconn/create-icore 0.5.2 → 0.6.1

package/dist/cli.js

@@ -195,7 +195,10 @@ Re-run with @latest to refresh:
     options: [
       { value: "tcp", label: "TCP (default, no broker required)" },
       { value: "redis", label: "Redis" },
-      { value: "nats", label: "NATS" }
+      { value: "nats", label: "NATS" },
+      { value: "mqtt", label: "MQTT" },
+      { value: "rmq", label: "RabbitMQ" },
+      { value: "kafka", label: "Kafka" }
     ],
     initialValue: "tcp"
   });
@@ -265,6 +268,24 @@ async function copyTree(src, dest) {
     else if (entry.isFile()) await copyFile(s, d);
   }
 }
+var TRANSPORT_ENV_TOKEN = {
+  redis: "REDIS",
+  nats: "NATS",
+  mqtt: "MQTT",
+  rmq: "RMQ",
+  kafka: "KAFKA"
+};
+var TRANSPORT_DEPS = {
+  nats: { nats: "^2.29.3" },
+  mqtt: { mqtt: "^5.15.1" },
+  rmq: { amqplib: "^2.0.1", "amqp-connection-manager": "^5.0.0" },
+  kafka: { kafkajs: "^2.2.4" }
+};
+function uncommentTransportEnv(text2, prefix, transport) {
+  const token = TRANSPORT_ENV_TOKEN[transport];
+  if (!token) return text2;
+  return text2.replace(new RegExp(`^# (${prefix}_${token}_[A-Z0-9_]*=)`, "gm"), "$1");
+}
 async function rewriteRootPackageJson(targetDir, opts) {
   const pkgPath = join2(targetDir, "package.json");
   const raw = await readFile2(pkgPath, "utf8");
@@ -273,38 +294,31 @@ async function rewriteRootPackageJson(targetDir, opts) {
   pkg["version"] = "0.0.1";
   pkg["private"] = true;
   delete pkg.description;
-  if (opts.transport === "nats") {
+  const transportDeps = TRANSPORT_DEPS[opts.transport];
+  if (transportDeps) {
     const deps = pkg["dependencies"] ??= {};
-    deps["nats"] = "^2.29.3";
+    Object.assign(deps, transportDeps);
   }
   if (opts.packageManager !== "yarn") {
     delete pkg.packageManager;
+  } else {
+    try {
+      const yarnrc = await readFile2(join2(targetDir, ".yarnrc.yml"), "utf8");
+      const match = yarnrc.match(/^yarnPath:\s*.+yarn-(\d+\.\d+\.\d+)\.cjs/m);
+      if (match?.[1]) {
+        pkg["packageManager"] = `yarn@${match[1]}`;
+      }
+    } catch {
+    }
   }
-  if (opts.packageManager === "pnpm") {
-    pkg["pnpm"] = {
-      onlyBuiltDependencies: [
-        "@firebase/util",
-        "@nestjs/core",
-        "@parcel/watcher",
-        "@scarf/scarf",
-        "@swc/core",
-        "less",
-        "msgpackr-extract",
-        "nx",
-        "protobufjs",
-        "unrs-resolver"
-      ]
-    };
-  }
+  delete pkg.pnpm;
   await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
 }
 async function writeAuthEnv(targetDir, opts) {
   const envExample = join2(targetDir, "apps/microservices/auth/.env.example");
   const env = await readFile2(envExample, "utf8");
   let next = env.replace(/^AUTH_PROVIDER=.*$/m, `AUTH_PROVIDER=${opts.authProvider}`).replace(/^AUTH_TRANSPORT=.*$/m, `AUTH_TRANSPORT=${opts.transport}`);
-  if (opts.transport !== "tcp") {
-    next = next.replace(/^# (AUTH_(?:REDIS|NATS)_URL=)/m, "$1");
-  }
+  next = uncommentTransportEnv(next, "AUTH", opts.transport);
   await writeFile(join2(targetDir, "apps/microservices/auth/.env"), next);
 }
 async function writeUploadEnv(targetDir, opts) {
@@ -312,9 +326,7 @@ async function writeUploadEnv(targetDir, opts) {
   const envExample = join2(targetDir, "apps/microservices/upload/.env.example");
   const env = await readFile2(envExample, "utf8");
   let next = env.replace(/^STORAGE_PROVIDER=.*$/m, `STORAGE_PROVIDER=${opts.upload}`).replace(/^UPLOAD_TRANSPORT=.*$/m, `UPLOAD_TRANSPORT=${opts.transport}`);
-  if (opts.transport !== "tcp") {
-    next = next.replace(/^# (UPLOAD_(?:REDIS|NATS)_URL=)/m, "$1");
-  }
+  next = uncommentTransportEnv(next, "UPLOAD", opts.transport);
   await writeFile(join2(targetDir, "apps/microservices/upload/.env"), next);
 }
 async function writeNotesEnv(targetDir, opts) {
@@ -323,9 +335,7 @@ async function writeNotesEnv(targetDir, opts) {
   try {
     const env = await readFile2(envExample, "utf8");
     let next = env.replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`);
-    if (opts.transport !== "tcp") {
-      next = next.replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1");
-    }
+    next = uncommentTransportEnv(next, "NOTES", opts.transport);
     await writeFile(join2(targetDir, "apps/microservices/notes/.env"), next);
   } catch {
   }
@@ -334,8 +344,8 @@ async function writeGatewayEnv(targetDir, opts) {
   const envExample = join2(targetDir, "apps/api/.env.example");
   const env = await readFile2(envExample, "utf8");
   let next = env.replace(/^AUTH_TRANSPORT=.*$/m, `AUTH_TRANSPORT=${opts.transport}`).replace(/^UPLOAD_TRANSPORT=.*$/m, `UPLOAD_TRANSPORT=${opts.transport}`).replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`).replace(/^PAYMENT_TRANSPORT=.*$/m, `PAYMENT_TRANSPORT=${opts.transport}`);
-  if (opts.transport !== "tcp") {
-    next = next.replace(/^# (AUTH_(?:REDIS|NATS)_URL=)/m, "$1").replace(/^# (UPLOAD_(?:REDIS|NATS)_URL=)/m, "$1").replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1").replace(/^# (PAYMENT_(?:REDIS|NATS)_URL=)/m, "$1");
+  for (const prefix of ["AUTH", "UPLOAD", "NOTES", "PAYMENT"]) {
+    next = uncommentTransportEnv(next, prefix, opts.transport);
   }
   await writeFile(join2(targetDir, "apps/api/.env"), next);
 }
@@ -373,9 +383,7 @@ async function writePaymentEnv(targetDir, opts) {
   try {
     const env = await readFile2(envExample, "utf8");
     let next = env.replace(/^PAYMENT_PROVIDER=.*$/m, `PAYMENT_PROVIDER=${opts.payment}`).replace(/^PAYMENT_TRANSPORT=.*$/m, `PAYMENT_TRANSPORT=${opts.transport}`);
-    if (opts.transport !== "tcp") {
-      next = next.replace(/^# (PAYMENT_(?:REDIS|NATS)_URL=)/m, "$1");
-    }
+    next = uncommentTransportEnv(next, "PAYMENT", opts.transport);
     await writeFile(join2(targetDir, "apps/microservices/payment/.env"), next);
   } catch {
   }
@@ -464,7 +472,10 @@ async function removeNotesStack(targetDir) {
     await writeFile(appModulePath, next);
   } catch {
   }
-  await stripDeps(join2(targetDir, "apps/api/package.json"), ["@icore/notes-client"]);
+  await stripDeps(join2(targetDir, "apps/api/package.json"), [
+    "@icore/notes-client",
+    "@casl/ability"
+  ]);
   await stripGatewayTransport(targetDir, "NOTES");
   const tsconfigPath = join2(targetDir, "tsconfig.base.json");
   try {
@@ -476,21 +487,16 @@ async function removeNotesStack(targetDir) {
   const siderPath = join2(targetDir, "apps/client/src/components/layout/LayoutSider.tsx");
   try {
     const src = await readFile2(siderPath, "utf8");
-    const next = src.replace(", StickyNote", "").replace(/\n {8}<Link\n {10}to="\/_dashboard\/notes"[\s\S]*?<\/Link>/, "").replace(", FileTextOutlined", "").replace(
+    const next = src.replace(", StickyNote", "").replace(/\n {8}<Link\n {10}to="\/(?:_dashboard\/)?notes"[\s\S]*?<\/Link>/, "").replace(", FileTextOutlined", "").replace(
       "const selectedKey = pathname.includes('/notes')\n    ? 'notes'\n    : pathname.includes('/profile')",
       "const selectedKey = pathname.includes('/profile')"
     ).replace(
-      `
-    {
-      key: 'notes',
-      icon: <FileTextOutlined />,
-      label: <Link to="/_dashboard/notes">{t('notes.title')}</Link>,
-    },`,
+      /\n {4}\{\n {6}key: 'notes',\n {6}icon: <FileTextOutlined \/>,\n {6}label: <Link to="\/(?:_dashboard\/)?notes">\{t\('notes\.title'\)\}<\/Link>,\n {4}\},/,
       ""
     ).replace("import NoteOutlinedIcon from '@mui/icons-material/NoteOutlined';\n", "").replace(
-      /\n {8}<ListItemButton\n {10}component=\{Link\}\n {10}to="\/_dashboard\/notes"[\s\S]*?<\/ListItemButton>/,
+      /\n {8}<ListItemButton\n {10}component=\{Link\}\n {10}to="\/(?:_dashboard\/)?notes"[\s\S]*?<\/ListItemButton>/,
       ""
-    ).replace(/\n\s*<Link to="\/_dashboard\/notes">[\s\S]*?<\/Link>/m, "");
+    ).replace(/\n\s*<Link to="\/(?:_dashboard\/)?notes">[\s\S]*?<\/Link>/m, "");
     await writeFile(siderPath, next);
   } catch {
   }
@@ -633,7 +639,7 @@ async function removeUnusedDbStrategies(targetDir, dbProvider) {
     await stripTsconfigPath(targetDir, "@icore/db-supabase");
     try {
       const src = await readFile2(modulePath, "utf8");
-      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseDBStrategy[^}]*\} from '@icore\/db-supabase';\n/m, "").replace(/\nfunction makeSupabaseDB[\s\S]*?\n}\n/m, "").replace(
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseDBStrategy[^}]*\} from '@icore\/db-supabase';\n/m, "").replace(/\nfunction makeSupabaseDB[\s\S]*?\n}\n/m, "").replace(/\nfunction requireEnv[\s\S]*?\n}\n/m, "").replace(
         /if \(provider === 'supabase'\) return makeSupabaseDB\(cfg\);\n\s*return makeFirestoreDB\(cfg\);/m,
         "return makeFirestoreDB(cfg);"
       );
@@ -766,11 +772,69 @@ async function scaffold(opts, templatesDir2) {
     await rm(join2(opts.targetDir, ".yarn"), { recursive: true, force: true });
     await rm(join2(opts.targetDir, ".yarnrc.yml"), { force: true });
   }
+  if (opts.packageManager === "pnpm") {
+    await writePnpmWorkspace(opts.targetDir);
+    await rewritePnpmWorkspaceDeps(opts.targetDir);
+  }
   await patchGitignoreForPm(opts.targetDir, opts.packageManager);
   await writeAiFiles(opts.targetDir, opts);
   if (opts.install) runInstall(opts.targetDir, opts.packageManager);
   if (opts.initGit) gitInit(opts.targetDir, opts.projectName);
 }
+async function writePnpmWorkspace(targetDir) {
+  const pkgPath = join2(targetDir, "package.json");
+  const pkg = JSON.parse(await readFile2(pkgPath, "utf8"));
+  const workspaces = pkg.workspaces ?? [];
+  const packagesBlock = workspaces.map((p3) => `  - '${p3}'`).join("\n");
+  const allowBuilds = [
+    "@firebase/util",
+    "@nestjs/core",
+    "@parcel/watcher",
+    "@scarf/scarf",
+    "@swc/core",
+    "less",
+    "msgpackr-extract",
+    "nx",
+    "protobufjs",
+    "unrs-resolver"
+  ].map((p3) => `  '${p3}': true`).join("\n");
+  const content = `packages:
+${packagesBlock}
+
+allowBuilds:
+${allowBuilds}
+`;
+  await writeFile(join2(targetDir, "pnpm-workspace.yaml"), content);
+}
+async function rewritePnpmWorkspaceDeps(targetDir) {
+  const { readdir: rd } = await import("fs/promises");
+  async function walk(dir) {
+    const found = [];
+    let entries;
+    try {
+      entries = await rd(dir, { withFileTypes: true });
+    } catch {
+      return found;
+    }
+    for (const e of entries) {
+      if (e.isDirectory() && e.name !== "node_modules") {
+        found.push(...await walk(join2(dir, e.name)));
+      } else if (e.isFile() && e.name === "package.json") {
+        found.push(join2(dir, e.name));
+      }
+    }
+    return found;
+  }
+  const pkgFiles = await walk(targetDir);
+  for (const f of pkgFiles) {
+    try {
+      const raw = await readFile2(f, "utf8");
+      const next = raw.replace(/"(@icore\/[^"]+)":\s*"\*"/g, '"$1": "workspace:*"');
+      if (next !== raw) await writeFile(f, next);
+    } catch {
+    }
+  }
+}
 async function patchGitignoreForPm(targetDir, pm) {
   const giPath = join2(targetDir, ".gitignore");
   try {
@@ -874,7 +938,7 @@ Apache-2.0
 
 - **Branch strategy**: \`dev\` is default. Cut \`feature/<name>\` or \`bug/<name>\` from dev. PRs only target dev. Never push directly to main.
 - **No code without approval**: Propose changes first, wait for go-ahead.
-- **\u0417\u0410\u041A\u041E\u041D \u2014 no crash on missing .env**: MS factories must catch config errors, print a boxed banner with ALL missing vars, and return a Fake strategy in dev. In prod (\`NODE_ENV=production\`) throw the same banner. The \`formatEnvBanner\` + \`missingEnv\` helpers from \`@icore/shared\` handle this.
+- **RULE \u2014 no crash on missing .env**: MS factories must catch config errors, print a boxed banner with ALL missing vars, and return a Fake strategy in dev. In prod (\`NODE_ENV=production\`) throw the same banner. The \`formatEnvBanner\` + \`missingEnv\` helpers from \`@icore/shared\` handle this.
 - **Post-coding routine**: \`npx prettier --write <files>\` \u2192 \`${nx} lint <project>\` \u2192 \`${nx} build <project>\` \u2014 all green before committing.
 - **Nx generators only**: never hand-write \`project.json\` / tsconfig stacks. Use \`${nx} g @nx/<plugin>:<schematic>\`.
 

package/dist/index.cjs

@@ -74,6 +74,24 @@ async function copyTree(src, dest) {
     else if (entry.isFile()) await (0, import_promises.copyFile)(s, d);
   }
 }
+var TRANSPORT_ENV_TOKEN = {
+  redis: "REDIS",
+  nats: "NATS",
+  mqtt: "MQTT",
+  rmq: "RMQ",
+  kafka: "KAFKA"
+};
+var TRANSPORT_DEPS = {
+  nats: { nats: "^2.29.3" },
+  mqtt: { mqtt: "^5.15.1" },
+  rmq: { amqplib: "^2.0.1", "amqp-connection-manager": "^5.0.0" },
+  kafka: { kafkajs: "^2.2.4" }
+};
+function uncommentTransportEnv(text2, prefix, transport) {
+  const token = TRANSPORT_ENV_TOKEN[transport];
+  if (!token) return text2;
+  return text2.replace(new RegExp(`^# (${prefix}_${token}_[A-Z0-9_]*=)`, "gm"), "$1");
+}
 async function rewriteRootPackageJson(targetDir, opts) {
   const pkgPath = (0, import_node_path.join)(targetDir, "package.json");
   const raw = await (0, import_promises.readFile)(pkgPath, "utf8");
@@ -82,38 +100,31 @@ async function rewriteRootPackageJson(targetDir, opts) {
   pkg["version"] = "0.0.1";
   pkg["private"] = true;
   delete pkg.description;
-  if (opts.transport === "nats") {
+  const transportDeps = TRANSPORT_DEPS[opts.transport];
+  if (transportDeps) {
     const deps = pkg["dependencies"] ??= {};
-    deps["nats"] = "^2.29.3";
+    Object.assign(deps, transportDeps);
   }
   if (opts.packageManager !== "yarn") {
     delete pkg.packageManager;
+  } else {
+    try {
+      const yarnrc = await (0, import_promises.readFile)((0, import_node_path.join)(targetDir, ".yarnrc.yml"), "utf8");
+      const match = yarnrc.match(/^yarnPath:\s*.+yarn-(\d+\.\d+\.\d+)\.cjs/m);
+      if (match?.[1]) {
+        pkg["packageManager"] = `yarn@${match[1]}`;
+      }
+    } catch {
+    }
   }
-  if (opts.packageManager === "pnpm") {
-    pkg["pnpm"] = {
-      onlyBuiltDependencies: [
-        "@firebase/util",
-        "@nestjs/core",
-        "@parcel/watcher",
-        "@scarf/scarf",
-        "@swc/core",
-        "less",
-        "msgpackr-extract",
-        "nx",
-        "protobufjs",
-        "unrs-resolver"
-      ]
-    };
-  }
+  delete pkg.pnpm;
   await (0, import_promises.writeFile)(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
 }
 async function writeAuthEnv(targetDir, opts) {
   const envExample = (0, import_node_path.join)(targetDir, "apps/microservices/auth/.env.example");
   const env = await (0, import_promises.readFile)(envExample, "utf8");
   let next = env.replace(/^AUTH_PROVIDER=.*$/m, `AUTH_PROVIDER=${opts.authProvider}`).replace(/^AUTH_TRANSPORT=.*$/m, `AUTH_TRANSPORT=${opts.transport}`);
-  if (opts.transport !== "tcp") {
-    next = next.replace(/^# (AUTH_(?:REDIS|NATS)_URL=)/m, "$1");
-  }
+  next = uncommentTransportEnv(next, "AUTH", opts.transport);
   await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "apps/microservices/auth/.env"), next);
 }
 async function writeUploadEnv(targetDir, opts) {
@@ -121,9 +132,7 @@ async function writeUploadEnv(targetDir, opts) {
   const envExample = (0, import_node_path.join)(targetDir, "apps/microservices/upload/.env.example");
   const env = await (0, import_promises.readFile)(envExample, "utf8");
   let next = env.replace(/^STORAGE_PROVIDER=.*$/m, `STORAGE_PROVIDER=${opts.upload}`).replace(/^UPLOAD_TRANSPORT=.*$/m, `UPLOAD_TRANSPORT=${opts.transport}`);
-  if (opts.transport !== "tcp") {
-    next = next.replace(/^# (UPLOAD_(?:REDIS|NATS)_URL=)/m, "$1");
-  }
+  next = uncommentTransportEnv(next, "UPLOAD", opts.transport);
   await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "apps/microservices/upload/.env"), next);
 }
 async function writeNotesEnv(targetDir, opts) {
@@ -132,9 +141,7 @@ async function writeNotesEnv(targetDir, opts) {
   try {
     const env = await (0, import_promises.readFile)(envExample, "utf8");
     let next = env.replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`);
-    if (opts.transport !== "tcp") {
-      next = next.replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1");
-    }
+    next = uncommentTransportEnv(next, "NOTES", opts.transport);
     await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "apps/microservices/notes/.env"), next);
   } catch {
   }
@@ -143,8 +150,8 @@ async function writeGatewayEnv(targetDir, opts) {
   const envExample = (0, import_node_path.join)(targetDir, "apps/api/.env.example");
   const env = await (0, import_promises.readFile)(envExample, "utf8");
   let next = env.replace(/^AUTH_TRANSPORT=.*$/m, `AUTH_TRANSPORT=${opts.transport}`).replace(/^UPLOAD_TRANSPORT=.*$/m, `UPLOAD_TRANSPORT=${opts.transport}`).replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`).replace(/^PAYMENT_TRANSPORT=.*$/m, `PAYMENT_TRANSPORT=${opts.transport}`);
-  if (opts.transport !== "tcp") {
-    next = next.replace(/^# (AUTH_(?:REDIS|NATS)_URL=)/m, "$1").replace(/^# (UPLOAD_(?:REDIS|NATS)_URL=)/m, "$1").replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1").replace(/^# (PAYMENT_(?:REDIS|NATS)_URL=)/m, "$1");
+  for (const prefix of ["AUTH", "UPLOAD", "NOTES", "PAYMENT"]) {
+    next = uncommentTransportEnv(next, prefix, opts.transport);
   }
   await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "apps/api/.env"), next);
 }
@@ -182,9 +189,7 @@ async function writePaymentEnv(targetDir, opts) {
   try {
     const env = await (0, import_promises.readFile)(envExample, "utf8");
     let next = env.replace(/^PAYMENT_PROVIDER=.*$/m, `PAYMENT_PROVIDER=${opts.payment}`).replace(/^PAYMENT_TRANSPORT=.*$/m, `PAYMENT_TRANSPORT=${opts.transport}`);
-    if (opts.transport !== "tcp") {
-      next = next.replace(/^# (PAYMENT_(?:REDIS|NATS)_URL=)/m, "$1");
-    }
+    next = uncommentTransportEnv(next, "PAYMENT", opts.transport);
     await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "apps/microservices/payment/.env"), next);
   } catch {
   }
@@ -273,7 +278,10 @@ async function removeNotesStack(targetDir) {
     await (0, import_promises.writeFile)(appModulePath, next);
   } catch {
   }
-  await stripDeps((0, import_node_path.join)(targetDir, "apps/api/package.json"), ["@icore/notes-client"]);
+  await stripDeps((0, import_node_path.join)(targetDir, "apps/api/package.json"), [
+    "@icore/notes-client",
+    "@casl/ability"
+  ]);
   await stripGatewayTransport(targetDir, "NOTES");
   const tsconfigPath = (0, import_node_path.join)(targetDir, "tsconfig.base.json");
   try {
@@ -285,21 +293,16 @@ async function removeNotesStack(targetDir) {
   const siderPath = (0, import_node_path.join)(targetDir, "apps/client/src/components/layout/LayoutSider.tsx");
   try {
     const src = await (0, import_promises.readFile)(siderPath, "utf8");
-    const next = src.replace(", StickyNote", "").replace(/\n {8}<Link\n {10}to="\/_dashboard\/notes"[\s\S]*?<\/Link>/, "").replace(", FileTextOutlined", "").replace(
+    const next = src.replace(", StickyNote", "").replace(/\n {8}<Link\n {10}to="\/(?:_dashboard\/)?notes"[\s\S]*?<\/Link>/, "").replace(", FileTextOutlined", "").replace(
       "const selectedKey = pathname.includes('/notes')\n    ? 'notes'\n    : pathname.includes('/profile')",
       "const selectedKey = pathname.includes('/profile')"
     ).replace(
-      `
-    {
-      key: 'notes',
-      icon: <FileTextOutlined />,
-      label: <Link to="/_dashboard/notes">{t('notes.title')}</Link>,
-    },`,
+      /\n {4}\{\n {6}key: 'notes',\n {6}icon: <FileTextOutlined \/>,\n {6}label: <Link to="\/(?:_dashboard\/)?notes">\{t\('notes\.title'\)\}<\/Link>,\n {4}\},/,
       ""
     ).replace("import NoteOutlinedIcon from '@mui/icons-material/NoteOutlined';\n", "").replace(
-      /\n {8}<ListItemButton\n {10}component=\{Link\}\n {10}to="\/_dashboard\/notes"[\s\S]*?<\/ListItemButton>/,
+      /\n {8}<ListItemButton\n {10}component=\{Link\}\n {10}to="\/(?:_dashboard\/)?notes"[\s\S]*?<\/ListItemButton>/,
       ""
-    ).replace(/\n\s*<Link to="\/_dashboard\/notes">[\s\S]*?<\/Link>/m, "");
+    ).replace(/\n\s*<Link to="\/(?:_dashboard\/)?notes">[\s\S]*?<\/Link>/m, "");
     await (0, import_promises.writeFile)(siderPath, next);
   } catch {
   }
@@ -442,7 +445,7 @@ async function removeUnusedDbStrategies(targetDir, dbProvider) {
     await stripTsconfigPath(targetDir, "@icore/db-supabase");
     try {
       const src = await (0, import_promises.readFile)(modulePath, "utf8");
-      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseDBStrategy[^}]*\} from '@icore\/db-supabase';\n/m, "").replace(/\nfunction makeSupabaseDB[\s\S]*?\n}\n/m, "").replace(
+      const next = src.replace(/^import \{ createClient \} from '@supabase\/supabase-js';\n/m, "").replace(/^import \{[^}]*SupabaseDBStrategy[^}]*\} from '@icore\/db-supabase';\n/m, "").replace(/\nfunction makeSupabaseDB[\s\S]*?\n}\n/m, "").replace(/\nfunction requireEnv[\s\S]*?\n}\n/m, "").replace(
         /if \(provider === 'supabase'\) return makeSupabaseDB\(cfg\);\n\s*return makeFirestoreDB\(cfg\);/m,
         "return makeFirestoreDB(cfg);"
       );
@@ -575,11 +578,69 @@ async function scaffold(opts, templatesDir) {
     await (0, import_promises.rm)((0, import_node_path.join)(opts.targetDir, ".yarn"), { recursive: true, force: true });
     await (0, import_promises.rm)((0, import_node_path.join)(opts.targetDir, ".yarnrc.yml"), { force: true });
   }
+  if (opts.packageManager === "pnpm") {
+    await writePnpmWorkspace(opts.targetDir);
+    await rewritePnpmWorkspaceDeps(opts.targetDir);
+  }
   await patchGitignoreForPm(opts.targetDir, opts.packageManager);
   await writeAiFiles(opts.targetDir, opts);
   if (opts.install) runInstall(opts.targetDir, opts.packageManager);
   if (opts.initGit) gitInit(opts.targetDir, opts.projectName);
 }
+async function writePnpmWorkspace(targetDir) {
+  const pkgPath = (0, import_node_path.join)(targetDir, "package.json");
+  const pkg = JSON.parse(await (0, import_promises.readFile)(pkgPath, "utf8"));
+  const workspaces = pkg.workspaces ?? [];
+  const packagesBlock = workspaces.map((p2) => `  - '${p2}'`).join("\n");
+  const allowBuilds = [
+    "@firebase/util",
+    "@nestjs/core",
+    "@parcel/watcher",
+    "@scarf/scarf",
+    "@swc/core",
+    "less",
+    "msgpackr-extract",
+    "nx",
+    "protobufjs",
+    "unrs-resolver"
+  ].map((p2) => `  '${p2}': true`).join("\n");
+  const content = `packages:
+${packagesBlock}
+
+allowBuilds:
+${allowBuilds}
+`;
+  await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "pnpm-workspace.yaml"), content);
+}
+async function rewritePnpmWorkspaceDeps(targetDir) {
+  const { readdir: rd } = await import("fs/promises");
+  async function walk(dir) {
+    const found = [];
+    let entries;
+    try {
+      entries = await rd(dir, { withFileTypes: true });
+    } catch {
+      return found;
+    }
+    for (const e of entries) {
+      if (e.isDirectory() && e.name !== "node_modules") {
+        found.push(...await walk((0, import_node_path.join)(dir, e.name)));
+      } else if (e.isFile() && e.name === "package.json") {
+        found.push((0, import_node_path.join)(dir, e.name));
+      }
+    }
+    return found;
+  }
+  const pkgFiles = await walk(targetDir);
+  for (const f of pkgFiles) {
+    try {
+      const raw = await (0, import_promises.readFile)(f, "utf8");
+      const next = raw.replace(/"(@icore\/[^"]+)":\s*"\*"/g, '"$1": "workspace:*"');
+      if (next !== raw) await (0, import_promises.writeFile)(f, next);
+    } catch {
+    }
+  }
+}
 async function patchGitignoreForPm(targetDir, pm) {
   const giPath = (0, import_node_path.join)(targetDir, ".gitignore");
   try {
@@ -683,7 +744,7 @@ Apache-2.0
 
 - **Branch strategy**: \`dev\` is default. Cut \`feature/<name>\` or \`bug/<name>\` from dev. PRs only target dev. Never push directly to main.
 - **No code without approval**: Propose changes first, wait for go-ahead.
-- **\u0417\u0410\u041A\u041E\u041D \u2014 no crash on missing .env**: MS factories must catch config errors, print a boxed banner with ALL missing vars, and return a Fake strategy in dev. In prod (\`NODE_ENV=production\`) throw the same banner. The \`formatEnvBanner\` + \`missingEnv\` helpers from \`@icore/shared\` handle this.
+- **RULE \u2014 no crash on missing .env**: MS factories must catch config errors, print a boxed banner with ALL missing vars, and return a Fake strategy in dev. In prod (\`NODE_ENV=production\`) throw the same banner. The \`formatEnvBanner\` + \`missingEnv\` helpers from \`@icore/shared\` handle this.
 - **Post-coding routine**: \`npx prettier --write <files>\` \u2192 \`${nx} lint <project>\` \u2192 \`${nx} build <project>\` \u2014 all green before committing.
 - **Nx generators only**: never hand-write \`project.json\` / tsconfig stacks. Use \`${nx} g @nx/<plugin>:<schematic>\`.
 
@@ -980,7 +1041,10 @@ Re-run with @latest to refresh:
     options: [
       { value: "tcp", label: "TCP (default, no broker required)" },
       { value: "redis", label: "Redis" },
-      { value: "nats", label: "NATS" }
+      { value: "nats", label: "NATS" },
+      { value: "mqtt", label: "MQTT" },
+      { value: "rmq", label: "RabbitMQ" },
+      { value: "kafka", label: "Kafka" }
     ],
     initialValue: "tcp"
   });

package/dist/index.d.cts

@@ -5,7 +5,7 @@ type PaymentProvider = 'paypal' | 'none';
 type JobsProvider = 'bullmq' | 'none';
 type ExampleMode = 'notes' | 'none';
 type UiLibrary = 'shadcn' | 'antd' | 'mui';
-type MsTransport = 'tcp' | 'redis' | 'nats';
+type MsTransport = 'tcp' | 'redis' | 'nats' | 'mqtt' | 'rmq' | 'kafka';
 type PackageManager = 'yarn' | 'npm' | 'pnpm';
 /**
  * Returns the correct invocation for a package.json script.

package/dist/index.d.ts

@@ -5,7 +5,7 @@ type PaymentProvider = 'paypal' | 'none';
 type JobsProvider = 'bullmq' | 'none';
 type ExampleMode = 'notes' | 'none';
 type UiLibrary = 'shadcn' | 'antd' | 'mui';
-type MsTransport = 'tcp' | 'redis' | 'nats';
+type MsTransport = 'tcp' | 'redis' | 'nats' | 'mqtt' | 'rmq' | 'kafka';
 type PackageManager = 'yarn' | 'npm' | 'pnpm';
 /**
  * Returns the correct invocation for a package.json script.