@altano/astro-prettier-response 0.0.2 → 1.0.0

package/README.md

@@ -95,7 +95,7 @@ export default defineConfig({
 });
 ```
 
-And if you like the behavior but you just hate seeing this logged every time you build, then configure Astro to disable minification yourself and the integration will stop logging:
+And if you like the default behavior but you just hate seeing this logged every time you build, then configure Astro to disable minification yourself and the integration will stop logging:
 
 ```js
 import prettierResponse from "@altano/astro-prettier-response";
@@ -112,7 +112,7 @@ export default defineConfig({
 });
 ```
 
-This will leave minification enabled but will still run your output through Prettier.
+This will do exactly the same thing (disable minification) and will still run your output through Prettier, but the log line will go away.
 
 ## How This Integration Works
 

package/dist/index.d.ts

@@ -1,3 +1,26 @@
-export { default } from "./integration.js";
-export type { AstroPrettierResponseConfig } from "./config.js";
+import { z } from "astro/zod";
+import { AstroIntegration } from "astro";
+
+//#region src/integration.d.ts
+declare const integration: (options?: {
+  disableMinifiers?: boolean | undefined;
+  formatXml?: boolean | undefined;
+}) => AstroIntegration & {};
+
+//#endregion
+//#region src/config.d.ts
+declare const ConfigSchema: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+  disableMinifiers: z.ZodDefault<z.ZodBoolean>;
+  formatXml: z.ZodDefault<z.ZodBoolean>;
+}, "strict", z.ZodTypeAny, {
+  disableMinifiers: boolean;
+  formatXml: boolean;
+}, {
+  disableMinifiers?: boolean | undefined;
+  formatXml?: boolean | undefined;
+}>>>;
+type AstroPrettierResponseConfig = z.infer<typeof ConfigSchema>;
+
+//#endregion
+export { AstroPrettierResponseConfig, integration as default };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,103 +1,52 @@
-// src/integration.ts
 import { runtimeLogger } from "@inox-tools/runtime-logger";
-import {
-  addVirtualImports,
-  createResolver,
-  defineIntegration
-} from "astro-integration-kit";
-
-// src/config.ts
+import { addVirtualImports, createResolver, defineIntegration } from "astro-integration-kit";
 import { z } from "astro/zod";
-var ConfigSchema = z.object({
-  /**
-   * Astro/Vite will minify your HTML/JS/CSS by default. Astro lightly
-   * compresses your HTML (not a full minifier) while Vite will fully compress
-   * your CSS/JS. Since we're going for prettiest output here, it makes sense
-   * for this integration to fully disable such minification.
-   *
-   * If you set this to false, and you use the default Astro config with
-   * minification enabled, you will still get your output formatted by
-   * Prettier, but it will be minified output that is formatted. So, for
-   * example, most of the variable names in your JS will be one character
-   * letters.
-   *
-   * @defaultValue true
-   */
-  disableMinifiers: z.boolean().default(true),
-  /**
-   * Install `@prettier/plugin-xml` package if you enable this
-   *
-   * Use the official Prettier plugin to format xml as well. Sitemaps and rss
-   * feeds are xml, so this would probably do something on your stock Astro
-   * site. Note: the Prettier output is only marginally better because xml is
-   * very whitespace sensitive and so Prettier's formatting is very strict and
-   * not that much prettier.
-   *
-   * @defaultValue false
-   */
-  formatXml: z.boolean().default(false)
+
+//#region src/config.ts
+const ConfigSchema = z.object({
+	disableMinifiers: z.boolean().default(true),
+	formatXml: z.boolean().default(false)
 }).strict().optional().default({});
 
-// src/integration.ts
-var integration_default = defineIntegration({
-  name: "astro-prettier-response",
-  optionsSchema: ConfigSchema,
-  setup({ options, name }) {
-    const { resolve } = createResolver(import.meta.url);
-    return {
-      hooks: {
-        "astro:config:setup": (params) => {
-          addVirtualImports(params, {
-            name,
-            imports: {
-              "virtual:astro-prettier-response/config": `export default ${JSON.stringify(ConfigSchema.parse(options))}`
-            }
-          });
-          runtimeLogger(params, { name: "astro-prettier-response" });
-          const { config, updateConfig, addMiddleware, logger } = params;
-          if (options.disableMinifiers) {
-            let didConfigOverride = false;
-            if (config.compressHTML !== false) {
-              didConfigOverride = true;
-              updateConfig({
-                compressHTML: false
-              });
-            }
-            if (config?.vite?.build?.minify !== false) {
-              didConfigOverride = true;
-              updateConfig({
-                vite: {
-                  build: {
-                    minify: false
-                  }
-                }
-              });
-            }
-            if (config?.vite?.build?.cssMinify !== false) {
-              didConfigOverride = true;
-              updateConfig({
-                vite: {
-                  build: {
-                    cssMinify: false
-                  }
-                }
-              });
-            }
-            if (didConfigOverride) {
-              logger.info(
-                `Disabling minification of html/css/js in Astro config (https://github.com/altano/npm-packages/tree/main/packages/astro-prettier-response#config-overrides)`
-              );
-            }
-          }
-          addMiddleware({
-            entrypoint: resolve("./middleware/index.js"),
-            order: "post"
-          });
-        }
-      }
-    };
-  }
+//#endregion
+//#region src/integration.ts
+const integration = defineIntegration({
+	name: "astro-prettier-response",
+	optionsSchema: ConfigSchema,
+	setup({ options, name }) {
+		const { resolve } = createResolver(import.meta.url);
+		return { hooks: { "astro:config:setup": (params) => {
+			addVirtualImports(params, {
+				name,
+				imports: { "virtual:astro-prettier-response/config": `export default ${JSON.stringify(ConfigSchema.parse(options))}` }
+			});
+			runtimeLogger(params, { name: "astro-prettier-response" });
+			const { config, updateConfig, addMiddleware, logger } = params;
+			if (options.disableMinifiers) {
+				let didConfigOverride = false;
+				if (config.compressHTML !== false) {
+					didConfigOverride = true;
+					updateConfig({ compressHTML: false });
+				}
+				if (config?.vite?.build?.minify !== false) {
+					didConfigOverride = true;
+					updateConfig({ vite: { build: { minify: false } } });
+				}
+				if (config?.vite?.build?.cssMinify !== false) {
+					didConfigOverride = true;
+					updateConfig({ vite: { build: { cssMinify: false } } });
+				}
+				if (didConfigOverride) logger.info(`Disabling minification of html/css/js in Astro config (https://github.com/altano/npm-packages/tree/main/packages/astro-prettier-response#config-overrides)`);
+			}
+			addMiddleware({
+				entrypoint: resolve("./middleware/index.js"),
+				order: "post"
+			});
+		} } };
+	}
 });
-export {
-  integration_default as default
-};
+var integration_default = integration;
+
+//#endregion
+export { integration_default as default };
+//# sourceMappingURL=index.js.map

package/dist/middleware/index.d.ts

@@ -1,2 +1,8 @@
-export declare const onRequest: import("astro").MiddlewareHandler;
+import { MiddlewareHandler } from "astro";
+
+//#region src/middleware/index.d.ts
+declare const onRequest: MiddlewareHandler;
+
+//#endregion
+export { onRequest };
 //# sourceMappingURL=index.d.ts.map

package/dist/middleware/index.js

@@ -1,94 +1,86 @@
-// src/middleware/index.ts
 import { defineMiddleware } from "astro/middleware";
-
-// src/middleware/filename.ts
 import mime from "mime-types";
+import { logger } from "@it-astro:logger:astro-prettier-response";
+import prettier from "prettier";
+import config from "virtual:astro-prettier-response/config";
 
-// src/middleware/is400.ts
+//#region src/middleware/is400.ts
 function is400(status) {
-  return status >= 400 && status < 500;
+	return status >= 400 && status < 500;
 }
 
-// src/middleware/filename.ts
+//#endregion
+//#region src/middleware/filename.ts
 function synthesizeFilename(response) {
-  const contentType = response.headers.get("content-type");
-  if (contentType == null) {
-    if (is400(response.status)) {
-      return "index.html";
-    }
-    return null;
-  }
-  const extensionFromContentType = mime.extension(contentType);
-  if (!extensionFromContentType) {
-    return null;
-  }
-  return `file.${extensionFromContentType}`;
+	const contentType = response.headers.get("content-type");
+	/* v8 ignore next 8 */
+	if (contentType == null) {
+		if (is400(response.status)) return "index.html";
+		return null;
+	}
+	const extensionFromContentType = mime.extension(contentType);
+	if (!extensionFromContentType) return null;
+	return `file.${extensionFromContentType}`;
 }
 
-// src/middleware/format.ts
-import { logger } from "@it-astro:logger:astro-prettier-response";
-
-// src/middleware/prettier.ts
-import prettier from "prettier";
-import config from "virtual:astro-prettier-response/config";
+//#endregion
+//#region src/middleware/prettier.ts
 function enhanceOptions(options = {}) {
-  if (!config.formatXml) {
-    return options;
-  }
-  const givenPlugins = options.plugins ?? [];
-  return {
-    ...options,
-    plugins: [...givenPlugins, "@prettier/plugin-xml"]
-  };
+	if (!config.formatXml) return options;
+	const givenPlugins = options.plugins ?? [];
+	return {
+		...options,
+		plugins: [...givenPlugins, "@prettier/plugin-xml"]
+	};
 }
 async function format(source, options) {
-  return prettier.format(source, enhanceOptions(options));
+	return prettier.format(source, enhanceOptions(options));
 }
 async function getFileInfo(source, options) {
-  return prettier.getFileInfo(source, enhanceOptions(options));
+	return prettier.getFileInfo(source, enhanceOptions(options));
 }
 
-// src/middleware/format.ts
+//#endregion
+//#region src/middleware/format.ts
 async function formatOrReturn(filepath, source) {
-  try {
-    const result = await format(source, {
-      filepath
-    });
-    logger.debug(`successfully formatted`);
-    return result;
-  } catch (e) {
-    logger.error(`failed to format`);
-    return source;
-  }
+	try {
+		const result = await format(source, { filepath });
+		logger.debug(`successfully formatted`);
+		return result;
+	} catch (e) {
+		logger.error(`failed to format`);
+		return source;
+	}
 }
 
-// src/middleware/index.ts
-import { logger as logger2 } from "@it-astro:logger:astro-prettier-response";
-var onRequest = defineMiddleware(async (context, next) => {
-  const response = await next();
-  if (!response.ok && !is400(response.status)) {
-    logger2.debug(`NOT formatting (status is not 2xx or 4xx)`);
-    return response;
-  }
-  const filename = synthesizeFilename(response);
-  if (filename == null) {
-    logger2.debug(`NOT formatting (couldn't determine filename/extension)`);
-    return response;
-  }
-  const fileInfo = await getFileInfo(filename);
-  if (fileInfo?.inferredParser == null) {
-    logger2.debug(`NOT formatting (Prettier has no parser for this file type)`);
-    return response;
-  }
-  const clone = response.clone();
-  const source = await clone.text();
-  const processedSource = await formatOrReturn(filename, source);
-  return new Response(processedSource, {
-    status: response.status,
-    headers: clone.headers,
-    statusText: clone.statusText
-  });
+//#endregion
+//#region src/middleware/index.ts
+const onRequest = defineMiddleware(async (context, next) => {
+	const response = await next();
+	if (!response.ok && !is400(response.status)) {
+		logger.debug(`NOT formatting (status is not 2xx or 4xx)`);
+		return response;
+	}
+	const filename = synthesizeFilename(response);
+	if (filename == null) {
+		logger.debug(`NOT formatting (couldn't determine filename/extension)`);
+		return response;
+	}
+	const fileInfo = await getFileInfo(filename);
+	if (fileInfo?.inferredParser == null) {
+		logger.debug(`NOT formatting (Prettier has no parser for this file type)`);
+		return response;
+	}
+	const clone = response.clone();
+	const source = await clone.text();
+	const processedSource = await formatOrReturn(filename, source);
+	return new Response(processedSource, {
+		status: response.status,
+		headers: clone.headers,
+		statusText: clone.statusText
+	});
 });
-export {
-  onRequest
-};
+
+//#endregion
+export { onRequest };
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altano/astro-prettier-response",
-  "version": "0.0.2",
+  "version": "1.0.0",
   "description": "Prettier html/css/js for your Astro site",
   "keywords": [
     "astro",
@@ -40,19 +40,19 @@
     "@prettier/plugin-xml": "^3.4.1",
     "@types/mime-types": "^2.1.4",
     "@types/node": "^22.13.10",
-    "@vitest/coverage-v8": "^3.1.1",
-    "astro": "^5.5.6",
+    "@vitest/coverage-v8": "^3.1.4",
+    "astro": "^5.8.0",
     "depcheck": "^1.4.7",
     "prettier": "^3.5.3",
-    "tsup": "^8.4.0",
+    "tsdown": "^0.12.3",
     "typescript": "^5.8.2",
     "vite": "^6.2.6",
-    "vitest": "^3.1.1",
+    "vitest": "^3.1.4",
     "zx": "^8.5.2",
-    "@altano/build-config": "0.0.0",
-    "@altano/tiny-async-pool": "3.0.2",
-    "@altano/testing": "0.0.0",
-    "@altano/tsconfig": "0.0.0"
+    "@altano/build-config": "0.0.1",
+    "@altano/testing": "0.0.1",
+    "@altano/tiny-async-pool": "4.0.0",
+    "@altano/tsconfig": "0.0.1"
   },
   "peerDependencies": {
     "astro": "5.x.x",
@@ -65,14 +65,13 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsup --config ./tsup.config.ts",
-    "build:types": "tsc --project tsconfig.declarations.json",
-    "check:types:astro-fixtures": "node --experimental-strip-types ./scripts/check-fixtures.ts",
+    "build": "tsdown",
+    "check:types:astro": "node --experimental-strip-types ./scripts/check-fixtures.ts",
     "check:types:src": "tsc --noEmit",
     "check:types:test": "tsc --noEmit --project ./tests/tsconfig.json",
     "check:unused-dependencies": "depcheck",
     "clean": "rm -rf .turbo && rm -rf .tsbuildinfo && rm -rf node_modules && rm -rf dist",
-    "dev": "tsup --watch",
+    "dev": "tsdown --watch",
     "format": "prettier --write src",
     "lint": "eslint",
     "lint:fix": "TIMING=1 eslint src/**/*.ts* --fix",

package/dist/config.d.ts

@@ -1,38 +0,0 @@
-import { z } from "astro/zod";
-export declare const ConfigSchema: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-    /**
-     * Astro/Vite will minify your HTML/JS/CSS by default. Astro lightly
-     * compresses your HTML (not a full minifier) while Vite will fully compress
-     * your CSS/JS. Since we're going for prettiest output here, it makes sense
-     * for this integration to fully disable such minification.
-     *
-     * If you set this to false, and you use the default Astro config with
-     * minification enabled, you will still get your output formatted by
-     * Prettier, but it will be minified output that is formatted. So, for
-     * example, most of the variable names in your JS will be one character
-     * letters.
-     *
-     * @defaultValue true
-     */
-    disableMinifiers: z.ZodDefault<z.ZodBoolean>;
-    /**
-     * Install `@prettier/plugin-xml` package if you enable this
-     *
-     * Use the official Prettier plugin to format xml as well. Sitemaps and rss
-     * feeds are xml, so this would probably do something on your stock Astro
-     * site. Note: the Prettier output is only marginally better because xml is
-     * very whitespace sensitive and so Prettier's formatting is very strict and
-     * not that much prettier.
-     *
-     * @defaultValue false
-     */
-    formatXml: z.ZodDefault<z.ZodBoolean>;
-}, "strict", z.ZodTypeAny, {
-    disableMinifiers: boolean;
-    formatXml: boolean;
-}, {
-    disableMinifiers?: boolean | undefined;
-    formatXml?: boolean | undefined;
-}>>>;
-export type AstroPrettierResponseConfig = z.infer<typeof ConfigSchema>;
-//# sourceMappingURL=config.d.ts.map

package/dist/integration.d.ts

@@ -1,6 +0,0 @@
-declare const _default: (options?: {
-    disableMinifiers?: boolean | undefined;
-    formatXml?: boolean | undefined;
-} | undefined) => import("astro").AstroIntegration & {};
-export default _default;
-//# sourceMappingURL=integration.d.ts.map

package/dist/middleware/filename.d.ts

@@ -1,2 +0,0 @@
-export declare function synthesizeFilename(response: Response): string | null;
-//# sourceMappingURL=filename.d.ts.map

package/dist/middleware/format.d.ts

@@ -1,2 +0,0 @@
-export declare function formatOrReturn(filepath: string, source: string): Promise<string>;
-//# sourceMappingURL=format.d.ts.map

package/dist/middleware/is400.d.ts

@@ -1,2 +0,0 @@
-export declare function is400(status: number): boolean;
-//# sourceMappingURL=is400.d.ts.map

package/dist/middleware/prettier.d.ts

@@ -1,4 +0,0 @@
-import prettier, { type Options } from "prettier";
-export declare function format(source: string, options?: Options): Promise<string>;
-export declare function getFileInfo(source: string, options?: Options): Promise<prettier.FileInfoResult>;
-//# sourceMappingURL=prettier.d.ts.map