@diia-inhouse/oxc-config 1.10.2 → 1.11.0

package/dist/oxlint/config.d.ts

@@ -1,8 +1,23 @@
-import { defineConfig, type OxlintConfig } from 'oxlint';
+import { type OxlintConfig } from 'oxlint';
 type Config = OxlintConfig & {
     ignorePatterns: string[];
 };
 export declare const base: Config;
 export declare const boundaries: Config;
-export { defineConfig };
+/**
+ * `defineConfig` used by every service's `oxlint.config.ts`.
+ *
+ * A service that sets its own `overrides` array does `{ ...boundaries, overrides: [...] }`.
+ * The shallow spread copies `boundaries.overrides`, but the explicit `overrides` key then
+ * *replaces* it — silently dropping the shared exemptions. To make consumption safe, we
+ * always prepend the shared overrides.
+ *
+ * Dedupe is by object identity, not by `files`: we only strip the shared overrides a service
+ * re-introduced by spreading `...boundaries.overrides` (oxlint's `defineConfig` is identity, so
+ * those are the same object references). Everything a service actually authored is kept and
+ * appended *after* the shared overrides — and since a later matching override wins in oxlint, a
+ * service can still redefine rules for the same `files` glob (e.g. re-enable a shared exemption).
+ */
+export declare const defineConfig: (config: OxlintConfig) => OxlintConfig;
+export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/oxlint/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../oxlint/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAA;AAExD,KAAK,MAAM,GAAG,YAAY,GAAG;IAAE,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAkdzD,eAAO,MAAM,IAAI,EAAE,MAA2C,CAAA;AAE9D,eAAO,MAAM,UAAU,EAAE,MAKb,CAAA;AAEZ,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../oxlint/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsC,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAA;AAE9E,KAAK,MAAM,GAAG,YAAY,GAAG;IAAE,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAodzD,eAAO,MAAM,IAAI,EAAE,MAAiD,CAAA;AAEpE,eAAO,MAAM,UAAU,EAAE,MAKb,CAAA;AAIZ;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,YAAY,KAAG,YAOnD,CAAA"}

package/dist/oxlint/config.js

@@ -1,5 +1,5 @@
 import { createRequire } from 'node:module';
-import { defineConfig } from 'oxlint';
+import { defineConfig as defineOxlintConfig } from 'oxlint';
 const require = createRequire(import.meta.url);
 const resolve = (pkg) => require.resolve(pkg).replace(/\/[^/]+$/, '');
 const resolveFile = (path) => new URL(path, import.meta.url).pathname;
@@ -220,7 +220,7 @@ const baseConfig = {
             },
         },
         {
-            files: ['**/deps/**', '**/deps.ts', 'src/index.ts'],
+            files: ['**/deps/**', '**/deps.ts', 'src/index.ts', 'src/workerEntry.ts'],
             rules: {
                 'eslint/no-restricted-imports': 'off',
             },
@@ -359,6 +359,8 @@ const boundariesExtension = {
                                 { type: 'deps' },
                                 { type: 'configs' },
                                 { type: 'worker' },
+                                { type: 'workerActivities' },
+                                { type: 'workerWorkflows' },
                             ],
                         },
                     },
@@ -441,11 +443,32 @@ const boundariesExtension = {
         ],
     },
 };
-export const base = defineConfig(baseConfig);
-export const boundaries = defineConfig({
+export const base = defineOxlintConfig(baseConfig);
+export const boundaries = defineOxlintConfig({
     ...baseConfig,
     jsPlugins: [...(baseConfig.jsPlugins ?? []), ...(boundariesExtension.jsPlugins ?? [])],
     settings: { ...boundariesExtension.settings },
     rules: { ...baseConfig.rules, ...boundariesExtension.rules },
 });
-export { defineConfig };
+const sharedOverrides = baseConfig.overrides ?? [];
+/**
+ * `defineConfig` used by every service's `oxlint.config.ts`.
+ *
+ * A service that sets its own `overrides` array does `{ ...boundaries, overrides: [...] }`.
+ * The shallow spread copies `boundaries.overrides`, but the explicit `overrides` key then
+ * *replaces* it — silently dropping the shared exemptions. To make consumption safe, we
+ * always prepend the shared overrides.
+ *
+ * Dedupe is by object identity, not by `files`: we only strip the shared overrides a service
+ * re-introduced by spreading `...boundaries.overrides` (oxlint's `defineConfig` is identity, so
+ * those are the same object references). Everything a service actually authored is kept and
+ * appended *after* the shared overrides — and since a later matching override wins in oxlint, a
+ * service can still redefine rules for the same `files` glob (e.g. re-enable a shared exemption).
+ */
+export const defineConfig = (config) => {
+    const serviceOverrides = (config.overrides ?? []).filter((override) => !sharedOverrides.includes(override));
+    return defineOxlintConfig({
+        ...config,
+        overrides: [...sharedOverrides, ...serviceOverrides],
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/oxc-config",
-    "version": "1.10.2",
+    "version": "1.11.0",
     "description": "OXC toolchain configs for Diia services: oxlint, oxfmt, oxc transformer",
     "author": "Diia",
     "type": "module",
@@ -36,7 +36,7 @@
         "eslint-import-resolver-oxc": "0.15.0",
         "eslint-plugin-regexp": "3.1.0",
         "eslint-plugin-security": "4.0.0",
-        "tsx": "4.21.0"
+        "tsx": "4.22.4"
     },
     "peerDependencies": {
         "oxfmt": ">= 0.43.0",
@@ -45,17 +45,17 @@
     },
     "devDependencies": {
         "@diia-inhouse/configs": "7.0.1",
-        "@typescript-eslint/parser": "8.59.1",
-        "@typescript-eslint/rule-tester": "8.59.1",
-        "@vitest/coverage-v8": "4.1.5",
-        "@vitest/ui": "4.1.5",
+        "@typescript-eslint/parser": "8.60.1",
+        "@typescript-eslint/rule-tester": "8.60.1",
+        "@vitest/coverage-v8": "4.1.8",
+        "@vitest/ui": "4.1.8",
         "lockfile-lint": "5.0.0",
         "madge": "8.0.0",
         "oxfmt": "0.47.0",
         "oxlint": "1.62.0",
         "oxlint-tsgolint": "0.22.1",
-        "semantic-release": "24.2.7",
-        "vitest": "4.1.5"
+        "semantic-release": "25.0.3",
+        "vitest": "4.1.8"
     },
     "commitlint": {
         "extends": "@diia-inhouse/configs/dist/commitlint"