kalup 0.1.0 → 0.1.1

package/README.md

@@ -7,10 +7,13 @@ Kalup keeps a HubSpot portal's properties, property groups and custom object sch
 ## Install
 
 ```sh
-npm install -D kalup @kalup/core   # or: pnpm add -D kalup @kalup/core, or: yarn add -D kalup @kalup/core
+npm install @kalup/core
+npm install -D kalup
 ```
 
-Node 22.13.1 or later. If your app imports the files at run time, put `@kalup/core` in `dependencies` instead.
+With pnpm, yarn or bun: `pnpm add @kalup/core && pnpm add -D kalup`, and the same with `yarn add` or `bun add`.
+
+Node 22.13.1 or later. Your app imports `@kalup/core` at run time (7 kB, no dependencies), so it is a regular dependency. The `kalup` CLI is a dev tool. If you skip the first line, `kalup init` adds `@kalup/core` to `package.json` for you.
 
 ## First run
 

package/dist/{commands-C--Xsk1p.mjs → commands-BpQ20pA7.mjs}

@@ -14731,6 +14731,29 @@ const BIOME_IGNORES = [
 		"!!.kalup/**"
 	]]
 ];
+const CORE = "@kalup/core";
+/** The dependency lists that count as having @kalup/core already. */
+const DEPENDENCY_LISTS = [
+	"dependencies",
+	"devDependencies",
+	"peerDependencies"
+];
+/** The first lockfile found names the package manager. */
+const LOCKFILES = [
+	["pnpm-lock.yaml", "pnpm"],
+	["yarn.lock", "yarn"],
+	["bun.lock", "bun"],
+	["bun.lockb", "bun"],
+	["package-lock.json", "npm"]
+];
+const MANAGERS = [
+	"npm",
+	"pnpm",
+	"yarn",
+	"bun"
+];
+/** A directory with one of these is the top of the project or workspace: the lockfile search stops there. */
+const PROJECT_ROOTS = [".git", "pnpm-workspace.yaml"];
 const DEFAULT_OBJECTS = [
 	"contacts",
 	"companies",
@@ -14749,6 +14772,7 @@ const AGENTS_BLOCK = /<!-- kalup:start/;
 const CLAUDE_POINTER = /@AGENTS\.md/;
 const LINE_INDENT = /\r?\n[ \t]*$/;
 const LINE_BREAK = /\r?\n/;
+const JSON_INDENT = /^([ \t]+)"/m;
 async function init(ctx) {
 	const { cwd, flags } = ctx;
 	const portalId = parsePortal$1(flags.portal);
@@ -14791,6 +14815,7 @@ async function init(ctx) {
 	if (kalup || env) files.push(".gitignore");
 	const note = ignoreInFormatter(cwd, biome, files);
 	writeAgentFiles(cwd, files);
+	const core = addCore(cwd, files);
 	let pulled;
 	try {
 		pulled = await pull({
@@ -14824,7 +14849,8 @@ async function init(ctx) {
 		scopes,
 		recommended,
 		writeScopes,
-		files
+		files,
+		packageJson: core.data
 	};
 	const lines = [
 		`Portal ${portalId}: ${account.accountType}, ${account.uiDomain}, ${account.timeZone}`,
@@ -14838,6 +14864,7 @@ async function init(ctx) {
 		...files.map((file) => `wrote ${file}`),
 		...note === void 0 ? [] : [note]
 	];
+	const next = core.next === void 0 ? "" : `${core.next}\n`;
 	if (pulled instanceof KalupError) {
 		const retry = {
 			code: "E_FIRST_PULL",
@@ -14847,7 +14874,7 @@ async function init(ctx) {
 		return {
 			data,
 			issues: [...pulled.issues, retry],
-			text: `${lines.join("\n")}\n`,
+			text: `${lines.join("\n")}\n${next}`,
 			exitCode: pulled.exitCode
 		};
 	}
@@ -14855,7 +14882,7 @@ async function init(ctx) {
 	return {
 		data,
 		issues: [...largeScope(pulled.data), ...pulled.issues ?? []],
-		text: `${lines.join("\n")}\n${pulled.text ?? ""}`,
+		text: `${lines.join("\n")}\n${pulled.text ?? ""}${next}`,
 		exitCode: pulled.exitCode
 	};
 }
@@ -14914,6 +14941,82 @@ function ignoreInFormatter(cwd, biome, files) {
 		files.push(biome.file);
 	}
 }
+/**
+* @kalup/core added to dependencies in package.json when no dependency list has it, as the files under kalup/ import it
+* at runtime. The file keeps its indentation, key order and final line break; dependencies are sorted, as npm keeps
+* them. Adds package.json to `files` when it wrote. `next` is the install step to print, when there is one.
+*/
+function addCore(cwd, files) {
+	const manager = packageManager(cwd);
+	const install = `${manager === "npm" ? "npm install" : `${manager} add`} ${CORE}`;
+	const path = join(cwd, "package.json");
+	if (!existsSync(path)) return {
+		data: {
+			added: false,
+			found: false,
+			manager
+		},
+		next: `No package.json here. The files under kalup/ import ${CORE}: install it in your app with ${install}.`
+	};
+	const text = readFileSync(path, "utf8");
+	const pkg = parseJson(text);
+	if (pkg instanceof Error || !isObject(pkg) || !DEPENDENCY_LISTS.every((field) => pkg[field] === void 0 || isObject(pkg[field]))) return {
+		data: {
+			added: false,
+			found: true,
+			manager
+		},
+		next: `package.json was left alone: init could not read its dependencies. Install ${CORE} in your app with ${install}.`
+	};
+	if (DEPENDENCY_LISTS.some((field) => isObject(pkg[field]) && Object.hasOwn(pkg[field], CORE))) return { data: {
+		added: false,
+		found: true,
+		manager
+	} };
+	const dependencies = {
+		...pkg.dependencies,
+		[CORE]: `^${version}`
+	};
+	pkg.dependencies = Object.fromEntries(Object.entries(dependencies).sort(([a], [b]) => a.localeCompare(b, "en")));
+	const eol = text.includes("\r\n") ? "\r\n" : "\n";
+	const json = JSON.stringify(pkg, null, JSON_INDENT.exec(text)?.[1] ?? "  ").replaceAll("\n", eol);
+	writeFileSync(path, `${json}${text.endsWith("\n") ? eol : ""}`);
+	files.push("package.json");
+	return {
+		data: {
+			added: true,
+			found: true,
+			manager
+		},
+		next: `Added ${CORE} to dependencies in package.json: run ${manager} install.`
+	};
+}
+function isObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function packageManager(cwd) {
+	const dirs = projectDirs(cwd);
+	for (const dir of dirs) {
+		const lock = LOCKFILES.find(([file]) => existsSync(join(dir, file)));
+		if (lock !== void 0) return lock[1];
+	}
+	for (const dir of dirs) {
+		const pkg = parseJson(existsSync(join(dir, "package.json")) ? readFileSync(join(dir, "package.json"), "utf8") : "");
+		const field = isObject(pkg) && typeof pkg.packageManager === "string" ? pkg.packageManager.split("@")[0] : void 0;
+		if (field !== void 0 && MANAGERS.includes(field)) return field;
+	}
+	const agent = process.env.npm_config_user_agent?.split("/")[0] ?? "";
+	return MANAGERS.includes(agent) ? agent : "npm";
+}
+function projectDirs(cwd) {
+	const dirs = [cwd];
+	let dir = cwd;
+	while (!PROJECT_ROOTS.some((name) => existsSync(join(dir, name))) && dirname(dir) !== dir) {
+		dir = dirname(dir);
+		dirs.push(dir);
+	}
+	return dirs;
+}
 function writeAgentFiles(cwd, files) {
 	if (append(cwd, "AGENTS.md", agentsBlock, AGENTS_BLOCK, true)) files.push("AGENTS.md");
 	const claude = join(cwd, "CLAUDE.md");

package/dist/commands.mjs

@@ -1,2 +1,2 @@
-import { _ as TargetRebindCommand, a as CompareCommand, c as InitCommand, d as PlanCommand, f as PullCommand, g as StatusCommand, h as StateRebuildCommand, i as COMMANDS, l as IrCommand, m as SnapshotCommand, n as ApplyCommand, o as DocsCommand, p as RmCommand, r as BlueprintUpgradeCommand, s as FmtCommand, t as AddCommand, u as KalupCommand, v as ValidateCommand } from "./commands-C--Xsk1p.mjs";
+import { _ as TargetRebindCommand, a as CompareCommand, c as InitCommand, d as PlanCommand, f as PullCommand, g as StatusCommand, h as StateRebuildCommand, i as COMMANDS, l as IrCommand, m as SnapshotCommand, n as ApplyCommand, o as DocsCommand, p as RmCommand, r as BlueprintUpgradeCommand, s as FmtCommand, t as AddCommand, u as KalupCommand, v as ValidateCommand } from "./commands-BpQ20pA7.mjs";
 export { AddCommand, ApplyCommand, BlueprintUpgradeCommand, COMMANDS, CompareCommand, DocsCommand, FmtCommand, InitCommand, IrCommand, KalupCommand, PlanCommand, PullCommand, RmCommand, SnapshotCommand, StateRebuildCommand, StatusCommand, TargetRebindCommand, ValidateCommand };

package/dist/{host-BJWvo3sX.mjs → host-CcBOCkff.mjs}

@@ -1,4 +1,4 @@
-import { A as sanitize, C as usageError, D as disclaimer, E as bin, O as escapeJson, S as versionText, T as KalupError, b as formats, k as exitCodes, u as KalupCommand, w as IssueError, x as version, y as PATH_MAX } from "./commands-C--Xsk1p.mjs";
+import { A as sanitize, C as usageError, D as disclaimer, E as bin, O as escapeJson, S as versionText, T as KalupError, b as formats, k as exitCodes, u as KalupCommand, w as IssueError, x as version, y as PATH_MAX } from "./commands-BpQ20pA7.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";

package/dist/host.mjs

@@ -1,2 +1,2 @@
-import { n as isInteractive, r as run, t as execute } from "./host-BJWvo3sX.mjs";
+import { n as isInteractive, r as run, t as execute } from "./host-CcBOCkff.mjs";
 export { execute, isInteractive, run };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as isInteractive, r as run } from "./host-BJWvo3sX.mjs";
+import { n as isInteractive, r as run } from "./host-CcBOCkff.mjs";
 //#region src/index.ts
 process.exitCode = await run(process.argv.slice(2), {
 	cwd: process.cwd(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kalup",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Configuration as code for HubSpot: pull, compare, plan and apply properties and property groups",
   "keywords": [
     "hubspot",
@@ -63,13 +63,13 @@
   },
   "dependencies": {
     "@oclif/core": "^5.0.0",
-    "@kalup/core": "0.1.0"
+    "@kalup/core": "0.1.1"
   },
   "devDependencies": {
     "tsdown": "^0.23.0",
     "vitest": "^5.0.1",
-    "@kalup/tsconfig": "0.0.0",
-    "@kalup/engine": "0.0.0"
+    "@kalup/engine": "0.0.0",
+    "@kalup/tsconfig": "0.0.0"
   },
   "engines": {
     "node": ">=22.13.1"