kizlo 0.15.0 → 0.15.2

package/dist/cli/commands/create.js

@@ -1,4 +1,4 @@
-import { approveBuildsCommand, cleanupWorkspaceArtifacts, detectInvokingPackageManager, detectPackageManager, ensureGitignored, findWorkspaceRoot, initGitRepository, installArgs, isCommandAvailable, isGitRepository, isWorkspaceMember, runCommandCapturedAsync, tokenizeCommand } from "../utils.js";
+import { aliasWithSlash, approveBuildsCommand, cleanupWorkspaceArtifacts, detectInvokingPackageManager, detectPackageManager, effectiveAlias, ensureGitignored, findWorkspaceRoot, initGitRepository, installArgs, isCommandAvailable, isGitRepository, isWorkspaceMember, runCommandCapturedAsync, tokenizeCommand } from "../utils.js";
 import { fetchRegistry, listTemplates, resolveRegistry } from "../presets/source.js";
 import { adaptFile, changesFor, fileEntries, minCliError, patchEntries, readManifest, resolveDependencies } from "../presets/template.js";
 import { collectConnectionFromEnv, collectConnectionInteractively, collectTemplatePrompts, nextStepsLines, orCancel, pickAppPort, provisionLocalWordPress, readEnvExample, resolveEnvKeys, selectPackageManager, syncRemote, validate, withApiPath, writeEnv } from "./_setup.js";
@@ -183,13 +183,16 @@ function bootstrapArgs(manifest, pm, name, promptArgs = {}) {
 * files are written with `force`, silently replacing the framework defaults.
 */
 async function applyManifestWiring(dir, templateDir, manifest, opts) {
-	const { alias, kizloPath } = manifest.config;
+	const { kizloPath } = manifest.config;
+	const hasSrcDir = fs.existsSync(path.join(dir, "src"));
+	const alias = aliasWithSlash(effectiveAlias(dir, kizloPath, manifest.config.alias));
 	const scaffold = buildScaffoldContext(dir, {
 		dirRel: kizloPath,
-		hasSrcDir: fs.existsSync(path.join(dir, "src")),
+		hasSrcDir,
 		alias,
 		clientUrl: void 0
 	});
+	if (manifest.config.alias && !alias) p.log.warn(`The ${manifest.name ?? manifest.id} scaffold declares no tsconfig path for \`${aliasWithSlash(manifest.config.alias)}\`, so Kizlo wrote relative imports instead.`);
 	recordDependencies(dir, manifest);
 	const changes = changesFor(manifest, "create", { includeExamples: opts.includeExamples });
 	const files = [{

package/dist/cli/commands/init.js

@@ -1,4 +1,4 @@
-import { addDependencyArgs, aliasWithSlash, detectImportAlias, detectInvokingPackageManager, detectPackageManager, ensureGitignored, getVersion, loadEnvFiles, persistPackageManagerField, readPersistedAlias, runCommandAsync } from "../utils.js";
+import { addDependencyArgs, aliasWithSlash, detectImportAlias, detectInvokingPackageManager, detectPackageManager, effectiveAlias, ensureGitignored, getVersion, loadEnvFiles, persistPackageManagerField, readPersistedAlias, runCommandAsync } from "../utils.js";
 import { DEFAULT_REGISTRY, detectTemplates, fetchRegistry, isSingleTemplate, listTemplates, resolveRegistry } from "../presets/source.js";
 import { adaptFile, changesFor, fileEntries, isOlderVersion, minCliError, patchEntries, readManifest, renderNote, resolveDependencies, unmetRequirement } from "../presets/template.js";
 import { collectConnectionFromEnv, collectConnectionInteractively, dirPath, envConflicts, nextStepsNote, orCancel, provisionLocalWordPress, readEnvExample, resolveEnvKeys, selectPackageManager, syncRemote, validate, withApiPath, writeEnv } from "./_setup.js";
@@ -254,13 +254,15 @@ const init = defineCommand({
 				...aliasCtx,
 				envKeys
 			}) : await collectInteractively(aliasCtx);
-			setup.alias = aliasWithSlash(setup.alias);
+			const dirRel = setup.dir.replace(/^\.\//, "").replace(/\/+$/, "");
+			const requestedAlias = aliasWithSlash(setup.alias);
+			setup.alias = aliasWithSlash(effectiveAlias(cwd, dirRel, setup.alias));
+			const droppedAlias = requestedAlias && !setup.alias ? requestedAlias : void 0;
 			if (apiPath && setup.baseUrl) setup.baseUrl = withApiPath(setup.baseUrl, apiPath);
 			const includeExamples = yes ? true : orCancel(await p.confirm({
 				message: "Add example pages?",
 				initialValue: true
 			}));
-			const dirRel = setup.dir.replace(/^\.\//, "").replace(/\/+$/, "");
 			const serverDirRel = path.join(dirRel, "server");
 			const clientUrl = setup.siteUrl && !sameOrigin(setup.siteUrl, setup.baseUrl) ? setup.baseUrl : void 0;
 			const scaffold = buildScaffoldContext(cwd, {
@@ -306,6 +308,7 @@ const init = defineCommand({
 			}
 			if (shouldPersistPm) persistPackageManagerField(cwd, pm);
 			const warnings = [];
+			if (droppedAlias) warnings.push(`No tsconfig path maps \`${droppedAlias}\` onto ${dirRel}, so relative imports were written instead. Add \`"${droppedAlias}*": ["./${hasSrcDir ? "src/" : ""}*"]\` to your tsconfig \`paths\` and re-run to use the alias.`);
 			const scaffolded = [];
 			let gitignore = "present";
 			const kizloSpec = `kizlo@${manifest.dependencies?.kizlo ?? `^${getVersion()}`}`;

package/dist/cli/utils.js

@@ -78,9 +78,14 @@ function relativeImport(targetRel, fromDirRel) {
 * Detects an import alias from tsconfig `paths` that covers `targetRel`, returning
 * `{ prefix, importPath }`. The prefix is what `init` persists to kizlo.config;
 * the import path is the full specifier. Returns undefined when no alias matches.
+* `preferred` (with or without its trailing slash) names the prefix the caller would
+* rather have and wins over an earlier-declared one — a project mapping both `#/*` and
+* `@/*` onto the same root would otherwise silently switch to whichever it declares first.
 */
-function detectImportAlias(cwd, targetRel) {
+function detectImportAlias(cwd, targetRel, preferred) {
 	const target = targetRel.split(path.sep).join("/").replace(/\/+$/, "");
+	const want = preferred?.replace(/\/+$/, "");
+	let fallback;
 	for (const [alias, mappings] of Object.entries(readTsconfigPaths(cwd) ?? {})) {
 		if (!alias.endsWith("/*")) continue;
 		const prefix = alias.slice(0, -2);
@@ -88,12 +93,16 @@ function detectImportAlias(cwd, targetRel) {
 			if (!mapping.endsWith("/*")) continue;
 			const base = mapping.slice(0, -2).replace(/^\.\//, "").replace(/^\.$/, "").replace(/\/+$/, "");
 			const baseSlash = base ? `${base}/` : "";
-			if (target === base || target.startsWith(baseSlash)) return {
+			if (target !== base && !target.startsWith(baseSlash)) continue;
+			const match = {
 				prefix,
 				importPath: `${prefix}/${target.slice(baseSlash.length)}`
 			};
+			if (prefix === want) return match;
+			fallback ??= match;
 		}
 	}
+	return fallback;
 }
 /**
 * Normalize an alias prefix to the canonical `@/` form — the way an import alias is actually written and
@@ -104,19 +113,24 @@ function aliasWithSlash(alias) {
 	return alias ? `${alias.replace(/\/+$/, "")}/` : "";
 }
 /**
-* Builds an import specifier for `targetRel` from `fromDirRel`. With an explicit
-* `alias` prefix (from kizlo.config), builds `<alias>/<target>`; an empty alias
-* forces a relative import. Without one, detects from tsconfig, else relative.
+* Builds an import specifier for `targetRel` from `fromDirRel`. An empty `alias` forces a relative
+* import; any other value is a preference, checked against tsconfig `paths` rather than asserted.
+* An alias the project never declares falls back to relative, which always resolves — writing
+* `@/lib/kizlo/server` into a project with no `@` mapping breaks its typecheck and its build.
 */
 function resolveModuleImport(cwd, targetRel, fromDirRel, alias) {
-	const target = targetRel.split(path.sep).join("/").replace(/\/+$/, "");
-	if (alias !== void 0) {
-		if (alias === "") return relativeImport(targetRel, fromDirRel);
-		const prefix = alias.replace(/\/+$/, "");
-		const base = detectImportAlias(cwd, targetRel);
-		return base && base.prefix === prefix ? base.importPath : `${prefix}/${target.replace(/^src\//, "")}`;
-	}
-	return detectImportAlias(cwd, targetRel)?.importPath ?? relativeImport(targetRel, fromDirRel);
+	if (alias === "") return relativeImport(targetRel, fromDirRel);
+	return detectImportAlias(cwd, targetRel, alias)?.importPath ?? relativeImport(targetRel, fromDirRel);
+}
+/**
+* The alias imports will really be written through, once the requested one is checked against the
+* project's tsconfig — `""` when nothing declared there covers `targetRel`. The single answer
+* `create` and `init` persist to kizlo.config, show in their summary and warn from, so all three
+* agree with what {@link resolveModuleImport} goes on to emit.
+*/
+function effectiveAlias(cwd, targetRel, requested) {
+	if (requested === "") return "";
+	return detectImportAlias(cwd, targetRel, requested)?.prefix ?? "";
 }
 /**
 * Loads the project's `.env` files into `process.env`. The single place env
@@ -624,4 +638,4 @@ function groupDefault(subCommandNames, run) {
 }
 
 //#endregion
-export { DEFAULT_ENV_KEYS, addDependencyArgs, aliasWithSlash, approveBuildsCommand, availablePackageManagers, cleanupWorkspaceArtifacts, detectImportAlias, detectInvokingPackageManager, detectPackageManager, ensureGitignored, envGroups, envKeysPresent, findWorkspaceRoot, getVersion, groupDefault, initGitRepository, installArgs, isCommandAvailable, isGitRepository, isWorkspaceMember, loadEnvFiles, mergeEnv, persistPackageManagerField, pickStackPort, readPersistedAlias, readTsconfigPaths, resolveModuleImport, runCommandAsync, runCommandCapturedAsync, tokenizeCommand, withSpinner, writeFileIfAbsent };
+export { DEFAULT_ENV_KEYS, addDependencyArgs, aliasWithSlash, approveBuildsCommand, availablePackageManagers, cleanupWorkspaceArtifacts, detectImportAlias, detectInvokingPackageManager, detectPackageManager, effectiveAlias, ensureGitignored, envGroups, envKeysPresent, findWorkspaceRoot, getVersion, groupDefault, initGitRepository, installArgs, isCommandAvailable, isGitRepository, isWorkspaceMember, loadEnvFiles, mergeEnv, persistPackageManagerField, pickStackPort, readPersistedAlias, readTsconfigPaths, resolveModuleImport, runCommandAsync, runCommandCapturedAsync, tokenizeCommand, withSpinner, writeFileIfAbsent };

package/dist/integrations/nextjs/utils.js

@@ -18,7 +18,10 @@ function createNextCookiesInterface() {
 			const cookies = (await import("next/headers")).cookies;
 			const cookieJar = await cookies();
 			try {
-				for (const cookie of cookieList) cookieJar.delete(cookie.name);
+				for (const cookie of cookieList) cookieJar.delete({
+					name: cookie.name,
+					...cookie.options
+				});
 			} catch {}
 		}
 	};

package/dist/package.js

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

package/dist/router.d.ts

@@ -179,7 +179,7 @@ declare const ROUTER_MAP: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | undefined;
+        orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | undefined;
         searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
         slug?: string | string[] | undefined;
         taxRelation?: "AND" | "OR" | undefined;
@@ -511,7 +511,7 @@ declare const ROUTER_MAP: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | "menu_order" | undefined;
+        orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | "menu_order" | undefined;
         searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
         slug?: string | string[] | undefined;
         parent?: string | number | (string | number)[] | undefined;
@@ -772,7 +772,7 @@ declare const ROUTER_MAP: {
         exclude?: string | number | (string | number)[] | undefined;
         include?: string | number | (string | number)[] | undefined;
         order?: "asc" | "desc" | undefined;
-        orderBy?: "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | "count" | undefined;
+        orderBy?: "id" | "count" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
         hideEmpty?: string | boolean | undefined;
         parent?: string | number | undefined;
         post?: string | number | undefined;
@@ -988,7 +988,7 @@ declare const ROUTER_MAP: {
         exclude?: string | number | (string | number)[] | undefined;
         include?: string | number | (string | number)[] | undefined;
         order?: "asc" | "desc" | undefined;
-        orderBy?: "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | "count" | undefined;
+        orderBy?: "id" | "count" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
         hideEmpty?: string | boolean | undefined;
         post?: string | number | undefined;
         slug?: string | string[] | undefined;
@@ -1151,7 +1151,7 @@ declare const ROUTER_MAP: {
     sitemaps: {
       list: Procedure<"internal", {}, {
         key: string;
-        type: "author" | "post_type" | "taxonomy";
+        type: "post_type" | "taxonomy" | "author";
         pages: number;
         lastmod: string;
       }[], DefinedErrorMapLike>;
@@ -1159,7 +1159,7 @@ declare const ROUTER_MAP: {
         origin: string;
         sitemaps: {
           key: string;
-          type: "author" | "post_type" | "taxonomy";
+          type: "post_type" | "taxonomy" | "author";
           pages: number;
           lastmod: string;
         }[];
@@ -1202,7 +1202,7 @@ declare const ROUTER_MAP: {
           include?: string | number | (string | number)[] | undefined;
           offset?: string | number | undefined;
           order?: "asc" | "desc" | undefined;
-          orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
+          orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
           searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
           slug?: string | string[] | undefined;
           taxRelation?: "AND" | "OR" | undefined;
@@ -1281,7 +1281,7 @@ declare const ROUTER_MAP: {
           include?: string | number | (string | number)[] | undefined;
           offset?: string | number | undefined;
           order?: "asc" | "desc" | undefined;
-          orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
+          orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
           searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
           slug?: string | string[] | undefined;
           taxRelation?: "AND" | "OR" | undefined;
@@ -1430,7 +1430,7 @@ declare const ROUTER_MAP: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "date" | "id" | "parent" | "post" | "include" | undefined;
+        orderby?: "id" | "date" | "parent" | "post" | "include" | undefined;
         parent?: string | number | (string | number)[] | undefined;
         parentExclude?: string | number | (string | number)[] | undefined;
         post?: string | number | (string | number)[] | undefined;

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/package.json

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