@topogram/cli 0.3.68 → 0.3.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topogram/cli",
-  "version": "0.3.68",
+  "version": "0.3.70",
   "description": "Topogram CLI for checking Topogram workspaces and generating app bundles.",
   "license": "Apache-2.0",
   "repository": {

package/src/cli/commands/template/check.js

@@ -92,7 +92,7 @@ function diagnosticForTemplateCreateFailure(message, templateSpec, step) {
       step
     });
   }
-  if (message.includes("is missing topo/") || message.includes("is missing topogram/")) {
+  if (message.includes("is missing topo/")) {
     return templateCheckDiagnostic({
       code: "template_topogram_missing",
       message,

package/src/generator/runtime/environment/index.js

@@ -396,7 +396,7 @@ function renderEnvironmentServerDevScript(plan, component = plan.runtimes.apis[0
   const guardPortsScript = options.componentScript ? '"$ROOT_DIR/scripts/guard-ports.mjs"' : '"$SCRIPT_DIR/guard-ports.mjs"';
   const serverPortExpression = runtimePortExpression(plan, plan.runtimes.apis, component, "SERVER_PORT");
   return renderEnvAwareShellScript([
-    `node ${guardPortsScript} api`,
+    `node ${guardPortsScript} api ${component.id}`,
     "",
     ...apiDatabaseExportLines(component),
     `export PORT="${serverPortExpression}"`,
@@ -417,7 +417,7 @@ function renderEnvironmentWebDevScript(plan, component = plan.runtimes.webs[0],
   const guardPortsScript = options.componentScript ? '"$ROOT_DIR/scripts/guard-ports.mjs"' : '"$SCRIPT_DIR/guard-ports.mjs"';
   const webPortExpression = runtimePortExpression(plan, plan.runtimes.webs, component, "WEB_PORT");
   return renderEnvAwareShellScript([
-    `node ${guardPortsScript} web`,
+    `node ${guardPortsScript} web ${component.id}`,
     "",
     ...(apiRuntime ? [`export PUBLIC_TOPOGRAM_API_BASE_URL="\${PUBLIC_TOPOGRAM_API_BASE_URL:-http://localhost:\${${apiRuntime.id.toUpperCase()}_PORT:-\${SERVER_PORT:-${apiRuntime.port}}}}"`] : []),
     `export TOPOGRAM_CORS_ORIGINS="\${TOPOGRAM_CORS_ORIGINS:-http://localhost:${webPortExpression},http://127.0.0.1:${webPortExpression}}"`,
@@ -478,6 +478,7 @@ function renderEnvironmentGuardPortsScript(plan) {
 import net from "node:net";
 
 const role = process.argv[2] || "stack";
+const targetId = process.argv[3] || "";
 const ports = ${JSON.stringify(ports, null, 2)};
 const expectedService = ${JSON.stringify(plan.runtimeReference.serviceName || "")};
 
@@ -533,6 +534,9 @@ for (const entry of ports) {
   if (role !== "stack" && role !== entry.type) {
     continue;
   }
+  if (targetId && entry.id !== targetId) {
+    continue;
+  }
   const port = effectivePort(entry);
   if (await portInUse(port)) {
     if (entry.type === "api") {

package/src/new-project/create.js

@@ -53,7 +53,7 @@ export function createNewProject({
   }
 
   ensureCreatableProjectRoot(projectRoot);
-  const workspaceCopy = copyTopogramWorkspace(template.root, projectRoot);
+  copyTopogramWorkspace(template.root, projectRoot);
   const projectConfig = writeProjectTemplateMetadata(projectRoot, template, templateProvenance);
   writeProjectPackage(projectRoot, engineRoot, template);
   writeExplainScript(projectRoot);
@@ -64,12 +64,6 @@ export function createNewProject({
   writeGeneratorPolicy(projectRoot, defaultGeneratorPolicy());
 
   const warnings = [];
-  if (workspaceCopy.legacyWorkspace) {
-    warnings.push(
-      `Template '${template.manifest.id}' still ships legacy topogram/ source. Copied it into this project as ${DEFAULT_TOPO_FOLDER_NAME}/. ` +
-        "This one-release package-ingress bridge will be removed after first-party packages migrate."
-    );
-  }
   if (template.manifest.includesExecutableImplementation) {
     writeTemplateTrustRecord(projectRoot, projectConfig);
     warnings.push(

package/src/new-project/project-files.js

@@ -55,7 +55,7 @@ export function ensureCreatableProjectRoot(projectRoot) {
 /**
  * @param {string} templateRoot
  * @param {string} projectRoot
- * @returns {{ legacyWorkspace: boolean }}
+ * @returns {void}
  */
 export function copyTopogramWorkspace(templateRoot, projectRoot) {
   const templateWorkspace = resolvePackageWorkspace(templateRoot);
@@ -74,7 +74,6 @@ export function copyTopogramWorkspace(templateRoot, projectRoot) {
       { recursive: true }
     );
   }
-  return { legacyWorkspace: templateWorkspace.legacy };
 }
 
 /**

package/src/new-project/template-resolution.js

@@ -6,7 +6,7 @@ import os from "node:os";
 import path from "node:path";
 
 import { assertSafeNpmSpec, localNpmrcEnv } from "../npm-safety.js";
-import { DEFAULT_TOPO_FOLDER_NAME, LEGACY_TOPOGRAM_FOLDER_NAME, resolvePackageWorkspace } from "../workspace-paths.js";
+import { DEFAULT_TOPO_FOLDER_NAME, resolvePackageWorkspace } from "../workspace-paths.js";
 import { GENERATOR_LABELS, SURFACE_ORDER, TEMPLATE_MANIFEST, unsupportedTemplateSymlinkMessage } from "./constants.js";
 import { isLocalTemplateSpec, packageNameFromSpec } from "./package-spec.js";
 
@@ -111,7 +111,7 @@ export function validateTemplateRoot(templateRoot) {
   const topogramRoot = workspace.root;
   const projectConfigPath = path.join(templateRoot, "topogram.project.json");
   if (fs.existsSync(topogramRoot) && fs.lstatSync(topogramRoot).isSymbolicLink()) {
-    throw new Error(unsupportedTemplateSymlinkMessage(manifest.id, workspace.legacy ? LEGACY_TOPOGRAM_FOLDER_NAME : DEFAULT_TOPO_FOLDER_NAME));
+    throw new Error(unsupportedTemplateSymlinkMessage(manifest.id, DEFAULT_TOPO_FOLDER_NAME));
   }
   if (fs.existsSync(projectConfigPath) && fs.lstatSync(projectConfigPath).isSymbolicLink()) {
     throw new Error(unsupportedTemplateSymlinkMessage(manifest.id, "topogram.project.json"));
@@ -122,7 +122,7 @@ export function validateTemplateRoot(templateRoot) {
   if (!fs.existsSync(projectConfigPath) || !fs.statSync(projectConfigPath).isFile()) {
     throw new Error(`Template '${manifest.id}' is missing topogram.project.json.`);
   }
-  assertTemplateTreeHasNoSymlinks(templateRoot, topogramRoot, workspace.legacy ? LEGACY_TOPOGRAM_FOLDER_NAME : DEFAULT_TOPO_FOLDER_NAME, manifest.id);
+  assertTemplateTreeHasNoSymlinks(templateRoot, topogramRoot, DEFAULT_TOPO_FOLDER_NAME, manifest.id);
   if (manifest.includesExecutableImplementation) {
     const implementationRoot = path.join(templateRoot, "implementation");
     if (fs.existsSync(implementationRoot) && fs.lstatSync(implementationRoot).isSymbolicLink()) {

package/src/workspace-paths.js

@@ -313,16 +313,12 @@ export function resolveTopoRoot(inputPath = ".") {
 
 /**
  * @param {string} packageRoot
- * @returns {{ root: string, legacy: boolean }}
+ * @returns {{ root: string }}
  */
 export function resolvePackageWorkspace(packageRoot) {
   const topoRoot = path.join(packageRoot, DEFAULT_TOPO_FOLDER_NAME);
   if (isDirectory(topoRoot)) {
-    return { root: topoRoot, legacy: false };
-  }
-  const legacyRoot = path.join(packageRoot, LEGACY_TOPOGRAM_FOLDER_NAME);
-  if (isDirectory(legacyRoot)) {
-    return { root: legacyRoot, legacy: true };
+    return { root: topoRoot };
   }
   throw new Error(`Package is missing ${DEFAULT_TOPO_FOLDER_NAME}/.`);
 }