zirka 0.0.61 → 0.0.63

package/README.md

@@ -39,12 +39,13 @@ Each config block is loaded lazily — if you don't enable `react`, none of its
 | `typescript`      | —                          | `typescript-eslint` strict + stylistic, type-aware |
 | `react`           | —                          | `@eslint-react`, `react-hooks`, `jsx-a11y`         |
 | `next`            | —                          | `@next/eslint-plugin-next`                         |
-| `playwright`      | —                          | `eslint-plugin-playwright`                         |     | `pasikaTypescriptApp` | —   | Pasika rules for a plain TypeScript repository |
+| `playwright`      | —                          | `eslint-plugin-playwright`                         |
+| `pasikaApp`       | —                          | Pasika rules for a plain TypeScript repository     |
 | `pasikaNextjsApp` | —                          | Pasika rules for a Next.js application             |
 
-Base rules (always included with any block): `@eslint/js` recommended, `@eslint-community/eslint-plugin-eslint-comments`, `eslint-plugin-unicorn`, and the hand-written best-practice, ES6, possible-errors, stylistic, and variables rule sets.
+Base rules (always included with any block): `@eslint/js` recommended, `@eslint-community/eslint-plugin-eslint-comments`, `eslint-plugin-unicorn`, the hand-written best-practice, ES6, possible-errors, stylistic, and variables rule sets, and `eslint-plugin-prettier` (with `eslint-config-prettier` disabling any ESLint stylistic rule that would fight it) — so `eslint --fix` also reformats JS/TS files against whatever `prettier.config` the repository resolves.
 
-### The pasika presets (`pasikaTypescriptApp` / `pasikaNextjsApp`)
+### The pasika presets (`pasikaApp` / `pasikaNextjsApp`)
 
 Enabling a pasika preset wires four language-scoped rule sets (see the pasika README for the full rule tables):
 
@@ -55,7 +56,7 @@ Enabling a pasika preset wires four language-scoped rule sets (see the pasika RE
 | `**/*.md` (not `_templates/`)              | `pasika/*` Markdown rules |
 | `package.json`                             | `pasika/*` JSON rules     |
 
-`typescriptApp` is the plain-TypeScript-repository preset — the package.json manifest, the zirka configuration contract, the `src/**` TypeScript app source, and the docs. `nextjsApp` is everything in `typescriptApp` plus the Next.js-stack manifest requirement, the Next.js app source rules, and the Tailwind stylesheet rules. The JS/TS base blocks (browser, node, typescript, react, next, playwright) are scoped to JS/TS files, so the pasika language blocks are never shadowed — CSS, Markdown, and JSON files are linted by their own rules.
+`pasikaApp` is the baseline preset for a plain TypeScript repository — the package.json manifest rules, the zirka configuration contract, and the docs. It carries no `src/**` block: source linting belongs to `pasikaNextjsApp`, which is everything in `pasikaApp` plus the Next.js-stack manifest requirement, the `src/**` app source rules, and the Tailwind stylesheet rules. The JS/TS base blocks (browser, node, typescript, react, next, playwright) are scoped to JS/TS files, so the pasika language blocks are never shadowed — CSS, Markdown, and JSON files are linted by their own rules.
 
 ### `RuleSeverity`
 
@@ -68,19 +69,19 @@ Enabling a pasika preset wires four language-scoped rule sets (see the pasika RE
 
 ### Options
 
-| Option                | Type                             | Description                                    |
-| --------------------- | -------------------------------- | ---------------------------------------------- |
-| `browser`             | `RuleSeverity`                   | Browser globals                                |
-| `node`                | `RuleSeverity`                   | Node.js globals                                |
-| `typescript`          | `RuleSeverity`                   | TypeScript-ESLint strict rules                 |
-| `react`               | `RuleSeverity`                   | React + JSX-a11y rules                         |
-| `next`                | `RuleSeverity`                   | Next.js rules                                  |
-| `pasikaTypescriptApp` | `RuleSeverity`                   | Pasika rules for a plain TypeScript repository |
-| `pasikaNextjsApp`     | `RuleSeverity`                   | Pasika rules for a Next.js application         |
-| `playwright`          | `RuleSeverity`                   | Playwright test rules                          |
-| `ignores`             | `string[]`                       | Glob patterns to ignore                        |
-| `additionalConfigs`   | `Linter.Config[]`                | Extra flat config entries appended last        |
-| `prettier`            | `true \| { tailwind?: boolean }` | Enable Prettier config                         |
+| Option              | Type                             | Description                                    |
+| ------------------- | -------------------------------- | ---------------------------------------------- |
+| `browser`           | `RuleSeverity`                   | Browser globals                                |
+| `node`              | `RuleSeverity`                   | Node.js globals                                |
+| `typescript`        | `RuleSeverity`                   | TypeScript-ESLint strict rules                 |
+| `react`             | `RuleSeverity`                   | React + JSX-a11y rules                         |
+| `next`              | `RuleSeverity`                   | Next.js rules                                  |
+| `pasikaApp`         | `RuleSeverity`                   | Pasika rules for a plain TypeScript repository |
+| `pasikaNextjsApp`   | `RuleSeverity`                   | Pasika rules for a Next.js application         |
+| `playwright`        | `RuleSeverity`                   | Playwright test rules                          |
+| `ignores`           | `string[]`                       | Glob patterns to ignore                        |
+| `additionalConfigs` | `Linter.Config[]`                | Extra flat config entries appended last        |
+| `prettier`          | `true \| { tailwind?: boolean }` | Enable Prettier config                         |
 
 ---
 

package/dist/styleguide.cjs

@@ -626,12 +626,14 @@ var init_variables = __esm({
 });
 
 // eslint/_base.ts
-var import_js, import_config3, baseConfig;
+var import_js, import_config3, import_eslint_config_prettier, import_eslint_plugin_prettier, baseConfig;
 var init_base = __esm({
   "eslint/_base.ts"() {
     "use strict";
     import_js = __toESM(require("@eslint/js"), 1);
     import_config3 = require("eslint/config");
+    import_eslint_config_prettier = __toESM(require("eslint-config-prettier"), 1);
+    import_eslint_plugin_prettier = __toESM(require("eslint-plugin-prettier"), 1);
     init_constants();
     init_best_practice();
     init_es6();
@@ -653,6 +655,18 @@ var init_base = __esm({
           ...variablesRules
         }
       },
+      {
+        // eslint-config-prettier's rules (all "off") must come after the rule sets
+        // above so they win, disabling any ESLint stylistic rule that would fight
+        // prettier. The prettier plugin then runs prettier itself as a rule, so
+        // `eslint --fix` also reformats — the config it reads is whatever the
+        // consuming repository's own prettier.config resolves to.
+        plugins: { prettier: import_eslint_plugin_prettier.default },
+        rules: {
+          ...import_eslint_config_prettier.default.rules,
+          "prettier/prettier": "error"
+        }
+      },
       {
         languageOptions: {
           ecmaVersion: ECMA_VERSION,
@@ -1086,8 +1100,8 @@ __export(styleguide_exports, {
 });
 module.exports = __toCommonJS(styleguide_exports);
 function styleguide(options) {
-  const { browser, node, typescript, react: react2, next, pasikaTypescriptApp, pasikaNextjsApp, playwright, prettier } = options;
-  const hasEslintOptions = browser ?? node ?? typescript ?? react2 ?? next ?? pasikaTypescriptApp ?? pasikaNextjsApp ?? playwright;
+  const { browser, node, typescript, react: react2, next, pasikaApp, pasikaNextjsApp, playwright, prettier } = options;
+  const hasEslintOptions = browser ?? node ?? typescript ?? react2 ?? next ?? pasikaApp ?? pasikaNextjsApp ?? playwright;
   const prettierConfig = prettier ? getPrettierConfig(prettier) : void 0;
   if (!hasEslintOptions) {
     return { prettierConfig };
@@ -1135,7 +1149,7 @@ var init_styleguide = __esm({
         typescript,
         react: react2,
         next,
-        pasikaTypescriptApp,
+        pasikaApp,
         pasikaNextjsApp,
         playwright,
         ignores,
@@ -1147,8 +1161,8 @@ var init_styleguide = __esm({
         { loader: () => Promise.resolve().then(() => (init_typescript2(), typescript_exports)).then((m) => m.typescriptConfig), severity: typescript },
         { loader: () => Promise.resolve().then(() => (init_react(), react_exports)).then((m) => m.reactConfig), severity: react2 },
         { loader: () => Promise.resolve().then(() => (init_next(), next_exports)).then((m) => m.nextConfig), severity: next },
-        { loader: () => loadPasikaConfigs("typescriptApp"), severity: pasikaTypescriptApp, isPasika: true },
-        { loader: () => loadPasikaConfigs("nextjsApp"), severity: pasikaNextjsApp, isPasika: true },
+        { loader: () => loadPasikaConfigs("pasikaApp"), severity: pasikaApp, isPasika: true },
+        { loader: () => loadPasikaConfigs("pasikaNextjsApp"), severity: pasikaNextjsApp, isPasika: true },
         { loader: () => Promise.resolve().then(() => (init_playwright(), playwright_exports)).then((m) => m.playwrightConfig), severity: playwright }
       ];
       const eslintConfigs = [];

package/dist/styleguide.d.cts

@@ -16,7 +16,7 @@ interface StyleguideOptions {
     typescript?: RuleSeverity;
     react?: RuleSeverity;
     next?: RuleSeverity;
-    pasikaTypescriptApp?: RuleSeverity;
+    pasikaApp?: RuleSeverity;
     pasikaNextjsApp?: RuleSeverity;
     playwright?: RuleSeverity;
     ignores?: string[];

package/dist/styleguide.d.ts

@@ -16,7 +16,7 @@ interface StyleguideOptions {
     typescript?: RuleSeverity;
     react?: RuleSeverity;
     next?: RuleSeverity;
-    pasikaTypescriptApp?: RuleSeverity;
+    pasikaApp?: RuleSeverity;
     pasikaNextjsApp?: RuleSeverity;
     playwright?: RuleSeverity;
     ignores?: string[];

package/dist/styleguide.js

@@ -612,6 +612,8 @@ var init_variables = __esm({
 // eslint/_base.ts
 import eslintJavascriptPlugin from "@eslint/js";
 import { defineConfig as defineConfig3 } from "eslint/config";
+import eslintConfigPrettier from "eslint-config-prettier";
+import prettierPlugin from "eslint-plugin-prettier";
 var baseConfig;
 var init_base = __esm({
   "eslint/_base.ts"() {
@@ -637,6 +639,18 @@ var init_base = __esm({
           ...variablesRules
         }
       },
+      {
+        // eslint-config-prettier's rules (all "off") must come after the rule sets
+        // above so they win, disabling any ESLint stylistic rule that would fight
+        // prettier. The prettier plugin then runs prettier itself as a rule, so
+        // `eslint --fix` also reformats — the config it reads is whatever the
+        // consuming repository's own prettier.config resolves to.
+        plugins: { prettier: prettierPlugin },
+        rules: {
+          ...eslintConfigPrettier.rules,
+          "prettier/prettier": "error"
+        }
+      },
       {
         languageOptions: {
           ecmaVersion: ECMA_VERSION,
@@ -1064,8 +1078,8 @@ var init_playwright = __esm({
 
 // styleguide.ts
 function styleguide(options) {
-  const { browser, node, typescript, react: react2, next, pasikaTypescriptApp, pasikaNextjsApp, playwright, prettier } = options;
-  const hasEslintOptions = browser ?? node ?? typescript ?? react2 ?? next ?? pasikaTypescriptApp ?? pasikaNextjsApp ?? playwright;
+  const { browser, node, typescript, react: react2, next, pasikaApp, pasikaNextjsApp, playwright, prettier } = options;
+  const hasEslintOptions = browser ?? node ?? typescript ?? react2 ?? next ?? pasikaApp ?? pasikaNextjsApp ?? playwright;
   const prettierConfig = prettier ? getPrettierConfig(prettier) : void 0;
   if (!hasEslintOptions) {
     return { prettierConfig };
@@ -1113,7 +1127,7 @@ var init_styleguide = __esm({
         typescript,
         react: react2,
         next,
-        pasikaTypescriptApp,
+        pasikaApp,
         pasikaNextjsApp,
         playwright,
         ignores,
@@ -1125,8 +1139,8 @@ var init_styleguide = __esm({
         { loader: () => Promise.resolve().then(() => (init_typescript2(), typescript_exports)).then((m) => m.typescriptConfig), severity: typescript },
         { loader: () => Promise.resolve().then(() => (init_react(), react_exports)).then((m) => m.reactConfig), severity: react2 },
         { loader: () => Promise.resolve().then(() => (init_next(), next_exports)).then((m) => m.nextConfig), severity: next },
-        { loader: () => loadPasikaConfigs("typescriptApp"), severity: pasikaTypescriptApp, isPasika: true },
-        { loader: () => loadPasikaConfigs("nextjsApp"), severity: pasikaNextjsApp, isPasika: true },
+        { loader: () => loadPasikaConfigs("pasikaApp"), severity: pasikaApp, isPasika: true },
+        { loader: () => loadPasikaConfigs("pasikaNextjsApp"), severity: pasikaNextjsApp, isPasika: true },
         { loader: () => Promise.resolve().then(() => (init_playwright(), playwright_exports)).then((m) => m.playwrightConfig), severity: playwright }
       ];
       const eslintConfigs = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zirka",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "description": "",
   "repository": {
     "type": "git",