@variablelab/vland 0.3.8-git-bd33f50.0 → 0.3.8-git-fb21900.0

package/dist/cli.usage.kdl

@@ -1,7 +1,7 @@
 // @generated by @usage-spec/commander from Commander.js metadata
 name vland
 bin vland
-version "0.3.8-git-bd33f50.0"
+version "0.3.8-git-fb21900.0"
 usage "[options] [command]"
 flag --usage help="print KDL spec for this CLI (https://kdl.dev)"
 cmd completion help="print shell completion script (usage)" {

package/dist/run.mjs

@@ -239,6 +239,20 @@ function rootPackageName({ template, projectName, visibility }) {
 	return template === "library" ? `${LIBRARY_SCOPES[visibility ?? "public"]}/${projectName}` : projectName;
 }
 /**
+* Sets `private: true` right after `version`, where package.json sorters
+* (oxfmt's among them) put it, so the file passes their format check as
+* generated. Mutates in place: a copy would drop the formatting pkg-types
+* remembers on the object.
+*/
+function setPrivate(packageJson) {
+	const keys = Object.keys(packageJson);
+	const moved = keys.slice(keys.indexOf("version") + 1).filter((key) => key !== "private").map((key) => [key, packageJson[key]]);
+	for (const [key] of moved) delete packageJson[key];
+	delete packageJson.private;
+	packageJson.private = true;
+	for (const [key, value] of moved) packageJson[key] = value;
+}
+/**
 * Writes the root `package.json`'s `name` ({@link rootPackageName}) and
 * `private` fields based on the chosen template and visibility. Uses
 * `pkg-types` so field ordering and JSON formatting survive. `private: true`
@@ -252,7 +266,7 @@ async function applyRootPackage(rootDir, options) {
 	const { template, visibility } = options;
 	try {
 		pkg.packageJson.name = rootPackageName(options);
-		if (template !== "library" || visibility === "private") pkg.packageJson.private = true;
+		if (template !== "library" || visibility === "private") setPrivate(pkg.packageJson);
 		await pkg.write(pkg.packageJson);
 	} catch (error) {
 		debug("skipped %s", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@variablelab/vland",
-  "version": "0.3.8-git-bd33f50.0",
+  "version": "0.3.8-git-fb21900.0",
   "description": "The CLI to init a new project in Variable Land",
   "homepage": "https://github.com/withvariablelab/dx/tree/main/vland/cli#readme",
   "bugs": {
@@ -35,8 +35,8 @@
     "commander": "14.0.3",
     "giget": "2.0.0",
     "nypm": "0.6.0",
-    "@variablelab/clibuddy": "0.7.4",
-    "@variablelab/loggy": "0.2.3"
+    "@variablelab/loggy": "0.2.3",
+    "@variablelab/clibuddy": "0.7.4"
   },
   "publishConfig": {
     "access": "public"

package/src/actions/placeholders.ts

@@ -1,10 +1,12 @@
 import fs from "node:fs";
 import { readdir, readFile, stat, writeFile } from "node:fs/promises";
 import { extname, join } from "node:path";
-import { createPkg } from "@variablelab/clibuddy";
+import { createPkg, type Pkg } from "@variablelab/clibuddy";
 import { logger } from "#src/services/logger.ts";
 import { LIBRARY_SCOPES, type TemplateName, type Visibility } from "./template.ts";
 
+type PackageJson = Pkg["packageJson"];
+
 export type Placeholders = {
   projectName: string;
   author: string;
@@ -132,6 +134,24 @@ export function rootPackageName({ template, projectName, visibility }: ApplyRoot
   return template === "library" ? `${LIBRARY_SCOPES[visibility ?? "public"]}/${projectName}` : projectName;
 }
 
+/**
+ * Sets `private: true` right after `version`, where package.json sorters
+ * (oxfmt's among them) put it, so the file passes their format check as
+ * generated. Mutates in place: a copy would drop the formatting pkg-types
+ * remembers on the object.
+ */
+function setPrivate(packageJson: PackageJson): void {
+  const keys = Object.keys(packageJson);
+  const moved = keys
+    .slice(keys.indexOf("version") + 1)
+    .filter((key) => key !== "private")
+    .map((key) => [key, packageJson[key]] as const);
+  for (const [key] of moved) delete packageJson[key];
+  delete packageJson.private;
+  packageJson.private = true;
+  for (const [key, value] of moved) packageJson[key] = value;
+}
+
 /**
  * Writes the root `package.json`'s `name` ({@link rootPackageName}) and
  * `private` fields based on the chosen template and visibility. Uses
@@ -150,9 +170,7 @@ export async function applyRootPackage(rootDir: string, options: ApplyRootPackag
 
   try {
     pkg.packageJson.name = rootPackageName(options);
-    if (template !== "library" || visibility === "private") {
-      pkg.packageJson.private = true;
-    }
+    if (template !== "library" || visibility === "private") setPrivate(pkg.packageJson);
     await pkg.write(pkg.packageJson);
   } catch (error) {
     debug("skipped %s", error);