create-objectstack 6.5.1 → 6.5.2

package/dist/index.js

@@ -46,6 +46,26 @@ var TEMPLATES = {
 function toTitleCase(str) {
   return str.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
+function sanitizeNamespace(name) {
+  let s = name.replace(/^@[^/]+\//, "");
+  s = s.toLowerCase().replace(/[^a-z0-9]+/g, "_");
+  s = s.replace(/^_+|_+$/g, "");
+  if (!s) s = "app";
+  if (/^[0-9]/.test(s)) s = "a" + s;
+  if (s.length < 2) s = (s + "_app").slice(0, 20);
+  if (s.length > 20) s = s.slice(0, 20).replace(/_+$/, "");
+  if (["base", "system", "sys"].includes(s)) s = (s + "_app").slice(0, 20);
+  return s;
+}
+function readCliVersion() {
+  try {
+    const pkgPath = path.resolve(__dirname, "..", "package.json");
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+    return String(pkg.version || "0.0.0");
+  } catch {
+    return "0.0.0";
+  }
+}
 function printHeader(title) {
   console.log(chalk.bold(`
 \u25C6 ${title}`));
@@ -147,8 +167,30 @@ async function loadRemote(pkgName, targetDir) {
     await rm(tmp, { recursive: true, force: true });
   }
 }
-function rewriteProjectIdentity(targetDir, projectName) {
+function walkAndRewriteTs(dir, fn) {
+  if (!fs.existsSync(dir)) return;
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      walkAndRewriteTs(full, fn);
+    } else if (entry.isFile() && entry.name.endsWith(".ts")) {
+      const before = fs.readFileSync(full, "utf8");
+      const after = fn(before);
+      if (after !== before) fs.writeFileSync(full, after);
+    }
+  }
+}
+function rewriteProjectIdentity(targetDir, projectName, namespace) {
   const title = toTitleCase(projectName);
+  let templateNamespace;
+  const manifestPathPre = path.join(targetDir, "objectstack.manifest.json");
+  if (fs.existsSync(manifestPathPre)) {
+    try {
+      const m = JSON.parse(fs.readFileSync(manifestPathPre, "utf8"));
+      if (typeof m.namespace === "string") templateNamespace = m.namespace;
+    } catch {
+    }
+  }
   const pkgPath = path.join(targetDir, "package.json");
   if (fs.existsSync(pkgPath)) {
     try {
@@ -164,6 +206,7 @@ function rewriteProjectIdentity(targetDir, projectName) {
       const m = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
       m.name = projectName;
       m.displayName = title;
+      if ("namespace" in m) m.namespace = namespace;
       fs.writeFileSync(manifestPath, JSON.stringify(m, null, 2) + "\n");
     } catch {
     }
@@ -172,9 +215,23 @@ function rewriteProjectIdentity(targetDir, projectName) {
   if (fs.existsSync(configPath)) {
     let cfg = fs.readFileSync(configPath, "utf8");
     cfg = cfg.replace(/(\bid:\s*)(['"`])[^'"`]*\2/, `$1$2${projectName}$2`);
+    cfg = cfg.replace(/(\bnamespace:\s*)(['"`])[^'"`]*\2/, `$1$2${namespace}$2`);
     cfg = cfg.replace(/(\bname:\s*)(['"`])[^'"`]*\2/, `$1$2${title}$2`);
     fs.writeFileSync(configPath, cfg);
   }
+  if (namespace !== templateNamespace && templateNamespace) {
+    const prefixRe = new RegExp(
+      `(\\bname:\\s*)(['"\`])${templateNamespace}_([a-z0-9_]+)\\2`,
+      "g"
+    );
+    walkAndRewriteTs(
+      path.join(targetDir, "src"),
+      (src) => src.replace(
+        prefixRe,
+        (_m, prefix, q, rest) => `${prefix}${q}${namespace}_${rest}${q}`
+      )
+    );
+  }
   const readmePath = path.join(targetDir, "README.md");
   if (fs.existsSync(readmePath)) {
     let md = fs.readFileSync(readmePath, "utf8");
@@ -182,7 +239,7 @@ function rewriteProjectIdentity(targetDir, projectName) {
     fs.writeFileSync(readmePath, md);
   }
 }
-var program = new Command().name("create-objectstack").description("Create a new ObjectStack environment").version("6.2.0").argument("[name]", "Environment name (defaults to current directory name)").option(
+var program = new Command().name("create-objectstack").description("Create a new ObjectStack environment").version(readCliVersion()).argument("[name]", "Environment name (defaults to current directory name)").option(
   "-t, --template <template>",
   `Template: ${Object.keys(TEMPLATES).join(", ")}`,
   "blank"
@@ -200,9 +257,11 @@ var program = new Command().name("create-objectstack").description("Create a new
   }
   const cwd = process.cwd();
   const projectName = name || path.basename(cwd);
+  const namespace = sanitizeNamespace(projectName);
   const targetDir = name ? path.resolve(cwd, name) : cwd;
   const isCurrentDir = targetDir === cwd;
   printKV("Environment", projectName);
+  printKV("Namespace", namespace);
   printKV("Template", `${options.template} \u2014 ${template.description}`);
   printKV("Directory", targetDir);
   console.log("");
@@ -221,7 +280,7 @@ var program = new Command().name("create-objectstack").description("Create a new
     } else {
       createdFiles = await loadRemote(template.source.pkg, targetDir);
     }
-    rewriteProjectIdentity(targetDir, projectName);
+    rewriteProjectIdentity(targetDir, projectName, namespace);
     console.log(chalk.bold("  Created files:"));
     for (const f of createdFiles.slice(0, 20)) {
       console.log(chalk.green(`    + ${f}`));
@@ -280,3 +339,6 @@ var program = new Command().name("create-objectstack").description("Create a new
   }
 });
 program.parse();
+export {
+  sanitizeNamespace
+};

package/dist/templates/blank/objectstack.config.ts

@@ -4,6 +4,7 @@ import * as objects from './src/objects/index.js';
 export default defineStack({
   manifest: {
     id: 'blank',
+    namespace: 'blank',
     version: '0.1.0',
     type: 'app',
     name: 'Blank Starter',

package/dist/templates/blank/objectstack.manifest.json

@@ -1,6 +1,7 @@
 {
   "$schema": "https://schemas.objectstack.dev/template-manifest.json",
   "name": "blank",
+  "namespace": "blank",
   "specVersion": "^6.0.0",
   "displayName": "Blank Starter",
   "description": "Minimal ObjectStack environment with a single object — a clean slate for building.",

package/dist/templates/blank/src/objects/note.object.ts

@@ -3,7 +3,7 @@
 import { ObjectSchema, Field } from '@objectstack/spec/data';
 
 export const Note = ObjectSchema.create({
-  name: 'note',
+  name: 'blank_note',
   label: 'Note',
   pluralLabel: 'Notes',
   icon: 'sticky-note',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-objectstack",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Create a new ObjectStack project — npx create-objectstack",
   "bin": {
     "create-objectstack": "./bin/create-objectstack.js"