@vizualmodel/vmblu-cli 0.3.2 → 0.3.4

package/README.md

@@ -1,7 +1,6 @@
 # CLI for vmblu
 This folder contains the CLI commands that are available for vmblu.
 
-
 ## Folder layout
 
 ```txt
@@ -12,7 +11,7 @@ vmblu/
       profile/
       migrate/
     templates/
-      0.8.2/
+      x.y.z/                # a directory per version x.y.z
         vmblu.schema.json
         vmblu.annex.md
         seed.md
@@ -25,7 +24,7 @@ vmblu/
 
 ## Add more commands
 
-Create commands/migrate/index.js with the same export shape { command, describe, builder, handler }. The router auto-discovers it, so users can run vmblu migrate ….
+Create commands/migrate/index.js with the same export shape { command, describe, builder, handler }. The router auto-discovers it.
 
 ## Dev/test workflow
 

package/commands/init/index.js

@@ -1,15 +1,20 @@
 // vmblu init [targetDir] --name <project> --schema <ver> --force --dry-run
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { initProject } from './init-project.js';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { initProject } from './init-project.js';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const pckg = require('../../package.json');
+
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 export const command = 'init <folder name>';
 export const describe = 'Scaffold an empty vmblu project';
 export const builder = [
   { flag: '--name <project>', desc: 'Project name (default: folder name)' },
-  { flag: '--schema <ver>',   desc: 'Schema version (default: 0.8.2)' },
+  { flag: '--schema <ver>',   desc: 'Schema version (default: latest version)' },
   { flag: '--force',          desc: 'Overwrite existing files' },
   { flag: '--dry-run',        desc: 'Show actions without writing' }
 ];
@@ -28,7 +33,7 @@ export const handler = async (argv) => {
 
   const targetDir = path.resolve(args._[0] || '.');
   const projectName = args.name || path.basename(targetDir);
-  const schemaVersion = args.schema || '0.8.2';
+  const schemaVersion = args.schema || pckg.schemaVersion;
 
   await initProject({
     targetDir,

package/commands/init/init-project.js

@@ -1,10 +1,17 @@
 // core/initProject.js
 // Node 18+ (fs/promises, crypto). No external deps.
-import * as fs from 'fs/promises';
-import * as fssync from 'fs';
-import path from 'path';
-//import crypto from 'crypto';
-import { makePackageJson } from './make-package-json.js';
+import * as fs from 'fs/promises';
+import * as fssync from 'fs';
+import path from 'path';
+//import crypto from 'crypto';
+import { makePackageJson } from './make-package-json.js';
+import { createRequire } from 'module';
+
+// Get the versions
+const require = createRequire(import.meta.url);
+const pckg = require('../../package.json');
+const SCHEMA_VERSION = pckg.schemaVersion
+const CLI_VERSION = pckg.version
 
 function rel(from, to) {
   return path.posix.join(...path.relative(from, to).split(path.sep));
@@ -50,12 +57,12 @@ function defaultModel(projectName) {
   const now = new Date().toISOString();
   return JSON.stringify({
     header: {
-      version: "0.8.2",
+      version: SCHEMA_VERSION,
       created: now,
       saved: now,
       utc: now,
       style: "#2c7be5",
-      runtime: "@vizualmodel/vmblu/runtime",
+      runtime: "@vizualmodel/vmblu-runtime",
       description: `${projectName} — vmblu model (scaffolded)`
     },
     models: [],
@@ -73,7 +80,7 @@ function defaultModel(projectName) {
 function defaultDoc(projectName) {
   const now = new Date().toISOString();
   return JSON.stringify({
-    version: "0.0.0",
+    version: CLI_VERSION,
     generatedAt: now,
     entries: {}
   }, null, 2);
@@ -145,7 +152,7 @@ async function initProject(opts) {
   const {
     targetDir,
     projectName = path.basename(opts.targetDir),
-    schemaVersion = "0.8.2",
+    schemaVersion = SCHEMA_VERSION,
     force = false,
     dryRun = false,
     templatesDir = path.join(__dirname, '..', 'templates'),
@@ -246,7 +253,7 @@ async function initProject(opts) {
   }
 
   // 5) Make the package file
-  makePackageJson({ absTarget, projectName, force, dryRun, addCliDep: true, cliVersion: "^0.1.0" }, ui);
+  makePackageJson({ absTarget, projectName, force, dryRun, addCliDep: true, cliVersion: "^" + CLI_VERSION }, ui);
 
   // 6) Final tree hint
   ui.info(`\nScaffold complete${dryRun ? ' (dry run)' : ''}:\n` +

package/commands/init/make-package-json.js

@@ -1,58 +1,72 @@
 import * as fs from 'fs/promises';
 import path from 'path';
+import { createRequire } from 'module';
 
-async function readJsonIfExists(file) {
+const require = createRequire(import.meta.url);
+const pckg = require('../../package.json');
+
+async function readJsonIfExists(file) {
   try { return JSON.parse(await fs.readFile(file, 'utf8')); } catch { return null; }
-}
+};
 
 function sortKeys(obj) {
   return Object.fromEntries(Object.entries(obj).sort(([a],[b]) => a.localeCompare(b)));
-}
+};
 
-export async function makePackageJson({
-  absTarget, projectName, force, dryRun,
-  addCliDep = true, cliVersion = "^0.1.0"
-}, ui) {
+export async function makePackageJson({
+                                        absTarget, 
+                                        projectName, 
+                                        force, 
+                                        dryRun,
+                                        addCliDep = true, 
+                                        cliVersion = "^"+pckg.version
+                                      }, ui) 
+{
+
+  // check if a pckage file exists
   const pkgPath = path.join(absTarget, 'package.json');
   const existing = await readJsonIfExists(pkgPath);
 
-  // Base skeleton (created if missing)
-  const basePkg = existing || {
+  // don't overwrite
+  if (existing && !force) return pkgPath;
+
+  // The base package with vite and typescript
+  const basePackage = {
     name: projectName,
     private: true,
     version: "0.0.0",
+    type: "module",
+    dependencies: {
+      "@vizualmodel/vmblu-runtime": "^0.1.0"
+    },
+    devDependencies : {
+      "@vizualmodel/vmblu-cli": "^0.3.3",
+      "typescript": "^5.9.3",
+      "vite": "^7.1.12",
+      // "ts-morph": "^26.0.0",
+      // "svelte": "^5.0.0",
+      // "@sveltejs/vite-plugin-svelte": "^6.2.1",
+      // "@tsconfig/svelte": "^5.0.2"
+    },
+    scripts : {
+      "vm:init": "vmblu init .",
+      "vm:profile": "vmblu profile",
+      "dev": "vite",
+      "build": "vite build",
+      "preview": "vite preview"
+    }
   };
 
-  // Add/merge scripts (idempotent)
-  basePkg.scripts = Object.assign({}, basePkg.scripts, {
-    "vm:init": "vmblu init ."
-  });
-
-  // Optionally add the CLI as a devDependency
-  if (addCliDep) {
-    basePkg.devDependencies = Object.assign({}, basePkg.devDependencies, {
-      "@vizualmodel/vmblu-cli": basePkg.devDependencies?.["@vizualmodel/vmblu-cli"] || cliVersion
-    });
-  }
-
-  // Nice-to-have: keep deterministic key order
-  const ordered = {
-    ...sortKeys(basePkg),
-    scripts: sortKeys(basePkg.scripts || {}),
-    devDependencies: basePkg.devDependencies ? sortKeys(basePkg.devDependencies) : undefined
-  };
 
-  if (existing && !force) {
-    ui.info(`update package.json (merge scripts${addCliDep ? " + devDependency" : ""})`);
-  } else if (!existing) {
+  if (!existing) {
     ui.info(`create ${pkgPath}`);
   } else {
     ui.info(`overwrite ${pkgPath} (force)`);
-  }
+  };
 
   if (!dryRun) {
-    await fs.writeFile(pkgPath, JSON.stringify(ordered, null, 2) + '\n', 'utf8');
-  }
+    await fs.writeFile(pkgPath, JSON.stringify(basePackage, null, 2) + '\n', 'utf8');
+  };
 
-  return pkgPath;
-}
+  return pkgPath;
+}