kizlo 0.8.3 → 0.8.4

package/dist/cli/commands/create.js

@@ -77,7 +77,7 @@ async function applyManifestWiring(dir, templateDir, manifest, opts) {
 		label: "Kizlo config",
 		relPath: "kizlo.config.ts",
 		contents: kizloConfigTemplate(kizloDir, alias, opts.devPath)
-	}, ...ownEntries(manifest, { includeStarter: true }).map((entry) => adaptOwnFile(templateDir, entry, manifest.tokens, scaffold))];
+	}, ...ownEntries(manifest, { includeStarter: opts.includeStarter }).map((entry) => adaptOwnFile(templateDir, entry, manifest.tokens, scaffold))];
 	for (const file of files) reportScaffold(file, await scaffoldFile(dir, file, {
 		force: true,
 		yes: false
@@ -155,6 +155,10 @@ const create = defineCommand({
 			})),
 			initialValue: defaultPm
 		}));
+		const includeStarter = orCancel(await p.confirm({
+			message: "Add example pages?",
+			initialValue: true
+		}));
 		const conn = await collectConnectionInteractively(preset);
 		if (preset.apiPath && conn.baseUrl) conn.baseUrl = withApiPath(conn.baseUrl, preset.apiPath);
 		if (conn.mode === "local" && !await dockerAvailable()) {
@@ -183,7 +187,10 @@ const create = defineCommand({
 			fail(`${preset.label} setup failed — see the output above and try again.`);
 		}
 		try {
-			await applyManifestWiring(dir, fetched.dir, manifest, { devPath: conn.devPath });
+			await applyManifestWiring(dir, fetched.dir, manifest, {
+				devPath: conn.devPath,
+				includeStarter
+			});
 		} catch (error) {
 			fail(error instanceof Error ? error.message : String(error));
 		}

package/dist/cli/commands/init.js

@@ -1,5 +1,5 @@
 import { dockerAvailable } from "../wp/docker.js";
-import { addDependencyArgs, detectImportAlias, detectPackageManager, ensureGitignored, getVersion, loadEnvFiles, runCommand } from "../utils.js";
+import { addDependencyArgs, detectImportAlias, detectPackageManager, ensureGitignored, getVersion, loadEnvFiles, runCommandAsync } from "../utils.js";
 import { printBanner } from "../banner.js";
 import { PRESETS, detectPreset, getPreset } from "../presets/index.js";
 import { fetchTemplate } from "../presets/source.js";
@@ -98,13 +98,13 @@ function isOlder(have, want) {
 * When the project's kizlo is older, upgrade the project up to it and say so — a deliberate pin is
 * never changed silently. Never downgrades.
 */
-function alignKizloVersion(cwd, pm, pkg, manifest) {
+async function alignKizloVersion(cwd, pm, pkg, manifest) {
 	const want = manifest.kizloVersion ?? `^${getVersion()}`;
 	const have = kizloDep(pkg);
 	if (!have || !isOlder(have, want)) return;
 	const s = p.spinner();
 	s.start(`Upgrading kizlo from ${have} to ${want}`);
-	const ok = runCommand(addDependencyArgs(pm, `kizlo@${want}`), cwd, "ignore");
+	const ok = await runCommandAsync(addDependencyArgs(pm, `kizlo@${want}`), cwd, "ignore");
 	s.stop(ok ? `Upgraded kizlo to ${want}` : `Could not upgrade kizlo automatically — install kizlo@${want} yourself`);
 }
 const init = defineCommand({
@@ -183,6 +183,10 @@ const init = defineCommand({
 		});
 		if (args.alias !== void 0) setup.alias = String(args.alias).trim();
 		setup.alias = aliasWithSlash(setup.alias);
+		const includeStarter = preset.template ? yes || orCancel(await p.confirm({
+			message: "Add example pages?",
+			initialValue: true
+		})) : false;
 		if (setup.mode === "local" && !await dockerAvailable()) {
 			p.cancel("Docker isn't available — start Docker (or install it) and re-run, or choose “Use my own WordPress”.");
 			process.exit(1);
@@ -191,7 +195,7 @@ const init = defineCommand({
 			const spec = `kizlo@^${getVersion()}`;
 			const s = p.spinner();
 			s.start(`Installing kizlo with ${pm}`);
-			const ok = runCommand(addDependencyArgs(pm, spec), cwd, "ignore");
+			const ok = await runCommandAsync(addDependencyArgs(pm, spec), cwd, "ignore");
 			s.stop(ok ? "Installed kizlo" : "Could not install kizlo automatically");
 			if (!ok) p.log.warn(`Install it yourself: ${addDependencyArgs(pm, spec).join(" ")}`);
 		}
@@ -221,8 +225,8 @@ const init = defineCommand({
 			const fetched = await fetchTemplate(preset.template);
 			try {
 				manifest = readManifest(fetched.dir);
-				alignKizloVersion(cwd, pm, pkg, manifest);
-				for (const entry of ownEntries(manifest)) files.push(adaptOwnFile(fetched.dir, entry, manifest.tokens, scaffold));
+				await alignKizloVersion(cwd, pm, pkg, manifest);
+				for (const entry of ownEntries(manifest, { includeStarter })) files.push(adaptOwnFile(fetched.dir, entry, manifest.tokens, scaffold));
 			} finally {
 				fetched.cleanup();
 			}

package/dist/cli/utils.js

@@ -180,15 +180,6 @@ function frameworkCreateArgs(pm, initializer, name, flags) {
 		];
 	}
 }
-function runCommand(args, cwd, stdio = "inherit") {
-	const [command, ...rest] = args;
-	if (!command) return false;
-	return spawnSync(command, rest, {
-		cwd,
-		stdio,
-		shell: process.platform === "win32"
-	}).status === 0;
-}
 /**
 * Async sibling of {@link runCommand}: runs a command without blocking the event loop, so a clack
 * spinner can keep animating while it works (a synchronous `spawnSync` would freeze it on the first
@@ -363,4 +354,4 @@ function groupDefault(subCommandNames, run) {
 }
 
 //#endregion
-export { addDependencyArgs, availablePackageManagers, detectImportAlias, detectInvokingPackageManager, detectPackageManager, ensureGitignored, envGroups, envKeysPresent, frameworkCreateArgs, getVersion, groupDefault, installArgs, loadEnvFiles, mergeEnv, pickStackPort, resolveModuleImport, runCommand, runCommandAsync, runCommandCaptured, withSpinner, writeFileIfAbsent };
+export { addDependencyArgs, availablePackageManagers, detectImportAlias, detectInvokingPackageManager, detectPackageManager, ensureGitignored, envGroups, envKeysPresent, frameworkCreateArgs, getVersion, groupDefault, installArgs, loadEnvFiles, mergeEnv, pickStackPort, resolveModuleImport, runCommandAsync, runCommandCaptured, withSpinner, writeFileIfAbsent };

package/dist/cli/wp/dev.js

@@ -1,6 +1,6 @@
 import { WordPressService } from "../../wordpress/service.js";
 import { DEFAULT_PLUGINS, TEST_ADMIN } from "./constants.js";
-import { compose, composeUp, wpCli } from "./docker.js";
+import { compose, composePull, composeUp, wpCli } from "./docker.js";
 import { ensurePlugins } from "./utils.js";
 import { createAdminAppPassword, seedUsers } from "./bootstrap.js";
 import { prepareByo } from "./byo.js";
@@ -74,7 +74,9 @@ async function seedDevFixtures(cfg, url) {
 */
 async function bootstrapDev(cfg) {
 	const url = devUrl(cfg.port);
-	const byo = !existsSync(join(cfg.wordpressDir, "wp-includes", "version.php")) && cfg.byo ? await prepareByo(cfg.byo, cfg.wordpressDir, cfg.configDir) : void 0;
+	const fresh = !existsSync(join(cfg.wordpressDir, "wp-includes", "version.php"));
+	const byo = fresh && cfg.byo ? await prepareByo(cfg.byo, cfg.wordpressDir, cfg.configDir) : void 0;
+	if (fresh && !byo) await composePull(["wordpress", "wp-cli"]).catch(() => void 0);
 	await composeUp();
 	const installed = (await compose([
 		"exec",

package/dist/cli/wp/docker.d.ts

@@ -22,6 +22,8 @@ interface Stack {
 /** Stack-bound docker helpers. */
 interface DockerStack {
   compose(args: string[], opts?: RunInput): Promise<RunResult>;
+  /** Pull the latest images for the named services (all when omitted) — refreshes a cached tag like `wordpress:latest`. */
+  composePull(services?: string[]): Promise<RunResult>;
   composeUp(): Promise<void>;
   composeStop(opts?: {
     detached?: boolean;
@@ -48,6 +50,8 @@ declare function dockerAvailable(): Promise<boolean>;
 declare function createStack(stack: Stack): DockerStack;
 /** `docker compose <args>` against the active stack. */
 declare const compose: DockerStack["compose"];
+/** Pull the latest images for the active stack's named services (all when omitted). */
+declare const composePull: (services?: string[]) => Promise<RunResult>;
 /** Bring the active stack's services up detached and wait for health checks. */
 declare const composeUp: () => Promise<void>;
 /** Tear the active stack down, optionally removing volumes. */
@@ -61,4 +65,4 @@ declare const composeStop: (opts?: {
 /** Run a wp-cli command against the active stack's warm `wp-cli` container. */
 declare const wpCli: (args: string[]) => Promise<string>;
 //#endregion
-export { DockerStack, RunResult, Stack, compose, composeDown, composeStop, composeUp, createStack, dockerAvailable, wpCli };
+export { DockerStack, RunResult, Stack, compose, composeDown, composePull, composeStop, composeUp, createStack, dockerAvailable, wpCli };

package/dist/cli/wp/docker.js

@@ -56,6 +56,7 @@ function bind(stack) {
 		WP_PORT: String(stack.port)
 	};
 	const compose$1 = (args, opts) => run("docker", [...base, ...args], env, opts);
+	const composePull$1 = (services = []) => compose$1(["pull", ...services]);
 	const composeUp$1 = async () => {
 		const res = await compose$1([
 			"up",
@@ -93,6 +94,7 @@ function bind(stack) {
 	};
 	return {
 		compose: compose$1,
+		composePull: composePull$1,
 		composeUp: composeUp$1,
 		composeStop: composeStop$1,
 		composeDown: composeDown$1,
@@ -117,6 +119,8 @@ function activeStack() {
 }
 /** `docker compose <args>` against the active stack. */
 const compose = (args, opts) => activeStack().compose(args, opts);
+/** Pull the latest images for the active stack's named services (all when omitted). */
+const composePull = (services) => activeStack().composePull(services);
 /** Bring the active stack's services up detached and wait for health checks. */
 const composeUp = () => activeStack().composeUp();
 /** Tear the active stack down, optionally removing volumes. */
@@ -127,4 +131,4 @@ const composeStop = (opts) => activeStack().composeStop(opts);
 const wpCli = (args) => activeStack().wpCli(args);
 
 //#endregion
-export { compose, composeDown, composeStop, composeUp, createStack, dockerAvailable, wpCli };
+export { compose, composeDown, composePull, composeStop, composeUp, createStack, dockerAvailable, wpCli };

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.8.3";
+var version = "0.8.4";
 
 //#endregion
 export { version };

package/dist/router.d.ts

@@ -764,7 +764,7 @@ declare const ROUTER_MAP: {
         exclude?: string | number | (string | number)[] | undefined;
         include?: string | number | (string | number)[] | undefined;
         order?: "asc" | "desc" | undefined;
-        orderBy?: "count" | "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
+        orderBy?: "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | "count" | undefined;
         hideEmpty?: string | boolean | undefined;
         parent?: string | number | undefined;
         post?: string | number | undefined;
@@ -976,7 +976,7 @@ declare const ROUTER_MAP: {
         exclude?: string | number | (string | number)[] | undefined;
         include?: string | number | (string | number)[] | undefined;
         order?: "asc" | "desc" | undefined;
-        orderBy?: "count" | "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
+        orderBy?: "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | "count" | undefined;
         hideEmpty?: string | boolean | undefined;
         post?: string | number | undefined;
         slug?: string | string[] | undefined;
@@ -1135,7 +1135,7 @@ declare const ROUTER_MAP: {
     sitemaps: {
       list: Procedure<"internal", {}, {
         key: string;
-        type: "post_type" | "taxonomy" | "author";
+        type: "author" | "post_type" | "taxonomy";
         pages: number;
         lastmod: string;
       }[], DefinedErrorMapLike>;
@@ -1143,7 +1143,7 @@ declare const ROUTER_MAP: {
         origin: string;
         sitemaps: {
           key: string;
-          type: "post_type" | "taxonomy" | "author";
+          type: "author" | "post_type" | "taxonomy";
           pages: number;
           lastmod: string;
         }[];

package/dist/seo/schema.d.ts

@@ -108,17 +108,17 @@ declare const Seo: z.ZodObject<{
 type Seo = z.infer<typeof Seo>;
 declare const CONTENT_TYPES: readonly ["post_type", "taxonomy", "author"];
 declare const ContentType: z.ZodEnum<{
+  author: "author";
   post_type: "post_type";
   taxonomy: "taxonomy";
-  author: "author";
 }>;
 type ContentType = z.infer<typeof ContentType>;
 declare const Sitemap: z.ZodObject<{
   key: z.ZodString;
   type: z.ZodEnum<{
+    author: "author";
     post_type: "post_type";
     taxonomy: "taxonomy";
-    author: "author";
   }>;
   pages: z.ZodNumber;
   lastmod: z.ZodString;
@@ -127,9 +127,9 @@ type Sitemap = z.infer<typeof Sitemap>;
 declare const SitemapList: z.ZodArray<z.ZodObject<{
   key: z.ZodString;
   type: z.ZodEnum<{
+    author: "author";
     post_type: "post_type";
     taxonomy: "taxonomy";
-    author: "author";
   }>;
   pages: z.ZodNumber;
   lastmod: z.ZodString;
@@ -140,9 +140,9 @@ declare const SitemapIndex: z.ZodObject<{
   sitemaps: z.ZodArray<z.ZodObject<{
     key: z.ZodString;
     type: z.ZodEnum<{
+      author: "author";
       post_type: "post_type";
       taxonomy: "taxonomy";
-      author: "author";
     }>;
     pages: z.ZodNumber;
     lastmod: z.ZodString;
@@ -174,9 +174,9 @@ declare const SitemapUrlList: z.ZodArray<z.ZodObject<{
 type SitemapUrlList = z.infer<typeof SitemapUrlList>;
 declare const ListSitemapUrlInputBase: z.ZodObject<{
   type: z.ZodEnum<{
+    author: "author";
     post_type: "post_type";
     taxonomy: "taxonomy";
-    author: "author";
   }>;
   page: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>, z.ZodCoercedNumber<string | number>>>;
 }, z.core.$strip>;

package/dist/test.d.ts

@@ -1,6 +1,6 @@
 import { DevPluginSource, Fixture, FixtureCleanupFn, FixtureSeedFn, JsonValue, LocalPlugin, PluginSource, SeedContext, TestAdminUser, TestCredentials, TestUser, defineFixture, isLocalPlugin } from "./cli/wp/types.js";
 import { COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, githubRelease, kizloRelease } from "./cli/wp/constants.js";
-import { DockerStack, RunResult, Stack, compose, composeDown, composeStop, composeUp, createStack, dockerAvailable, wpCli } from "./cli/wp/docker.js";
+import { DockerStack, RunResult, Stack, compose, composeDown, composePull, composeStop, composeUp, createStack, dockerAvailable, wpCli } from "./cli/wp/docker.js";
 import { activateLocalPlugin, credentialsPath, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, isSeeded, recordedPort, resolvePluginSource } from "./cli/wp/utils.js";
 import { TestAuthAdapterUser, toTestUser } from "./test/users.js";
 import { testAuthAdapter } from "./test/auth.js";
@@ -10,4 +10,4 @@ import { KizloClientTestInstance, getKizloClientTestInstance } from "./test/clie
 import { menuFixture } from "./menu/fixture.js";
 import { postFixture } from "./post/fixture.js";
 import { coreFixtures } from "./test/fixtures.js";
-export { CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DevPluginSource, DockerStack, Fixture, FixtureCleanupFn, FixtureSeedFn, JsonValue, KizloClientTestInstance, KizloTestInstance, LocalPlugin, OPCACHE_INI, PluginSource, REMAP_ENTRYPOINT, RunResult, SEED_MARKER_OPTION, SEED_VERSION, SeedContext, Stack, TEST_ADMIN, TEST_USER, TestAdminUser, TestAuthAdapterUser, TestCredentials, TestUser, activateLocalPlugin, captchaMock, compose, composeDown, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, ensurePlugin, ensurePlugins, findConfigDir, getKizloClientTestInstance, getKizloTestInstance, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, testAuthAdapter, toTestUser, wpCli };
+export { CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DevPluginSource, DockerStack, Fixture, FixtureCleanupFn, FixtureSeedFn, JsonValue, KizloClientTestInstance, KizloTestInstance, LocalPlugin, OPCACHE_INI, PluginSource, REMAP_ENTRYPOINT, RunResult, SEED_MARKER_OPTION, SEED_VERSION, SeedContext, Stack, TEST_ADMIN, TEST_USER, TestAdminUser, TestAuthAdapterUser, TestCredentials, TestUser, activateLocalPlugin, captchaMock, compose, composeDown, composePull, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, ensurePlugin, ensurePlugins, findConfigDir, getKizloClientTestInstance, getKizloTestInstance, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, testAuthAdapter, toTestUser, wpCli };

package/dist/test.js

@@ -1,6 +1,6 @@
 import { defineFixture, isLocalPlugin } from "./cli/wp/types.js";
 import { COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, githubRelease, kizloRelease } from "./cli/wp/constants.js";
-import { compose, composeDown, composeStop, composeUp, createStack, dockerAvailable, wpCli } from "./cli/wp/docker.js";
+import { compose, composeDown, composePull, composeStop, composeUp, createStack, dockerAvailable, wpCli } from "./cli/wp/docker.js";
 import { activateLocalPlugin, credentialsPath, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, isSeeded, recordedPort, resolvePluginSource } from "./cli/wp/utils.js";
 import { testAuthAdapter } from "./test/auth.js";
 import { CAPTCHA_TEST_TOKEN_PASS, captchaMock } from "./test/captcha.js";
@@ -11,4 +11,4 @@ import { coreFixtures } from "./test/fixtures.js";
 import { toTestUser } from "./test/users.js";
 import { getKizloTestInstance } from "./test/server.js";
 
-export { CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, activateLocalPlugin, captchaMock, compose, composeDown, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, ensurePlugin, ensurePlugins, findConfigDir, getKizloClientTestInstance, getKizloTestInstance, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, testAuthAdapter, toTestUser, wpCli };
+export { CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, activateLocalPlugin, captchaMock, compose, composeDown, composePull, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, ensurePlugin, ensurePlugins, findConfigDir, getKizloClientTestInstance, getKizloTestInstance, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, testAuthAdapter, toTestUser, wpCli };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kizlo",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "type": "module",
   "description": "A headless WordPress framework for TypeScript.",
   "keywords": [