cabloy 5.1.10 → 5.1.11

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 5.1.11
+
+### Features
+
+- Remove `testSecond` flavor scripts from `package.original.json`
+- Apply general updates
+
+### Improvements
+
+- Update `oxfmt` configuration
+
 ## 5.1.10
 
 ### Features

package/lint-staged.config.mjs

@@ -0,0 +1,92 @@
+// Must stay in sync with oxfmt.config.ts ignorePatterns
+const OXFMT_IGNORE_PATTERNS = [
+  // root original
+  '**/.claude',
+  '**/.vscode',
+  // file type patterns
+  '*.min.js',
+  '*.code-snippets',
+  // glob patterns
+  '**/dist/**',
+  '**/package-lock.json',
+  '**/yarn.lock',
+  '**/pnpm-lock.yaml',
+  '**/bun.lockb',
+  '**/static/**',
+  '**/.rollup.cache/**',
+  '**/.metadata/index.ts',
+  '**/.vitepress/cache',
+  '**/vite.config.ts.timestamp-*',
+  '**/quasar.config.ts.temporary.*',
+  // common directory patterns
+  '**/.vona',
+  '**/.assets',
+  '**/.app',
+  '**/.zova-rest',
+  '**/.zova',
+  '**/.nx',
+  '**/.quasar',
+  '**/coverage',
+  '**/docker-compose',
+  '**/assets',
+  '**/dist-releases',
+  '**/dist-mock',
+  '**/src-capacitor',
+  '**/src-cordova',
+  // vona-specific
+  '**/zovaRest',
+  'vona/packages-cli/cli-set-api/cli/templates',
+  // zova-specific
+  'zova/packages-cli/cli-set-front/cli/templates',
+];
+
+function isOxfmtIgnored(filepath) {
+  const parts = filepath.split('/');
+  const basename = parts.at(-1);
+  return OXFMT_IGNORE_PATTERNS.some(pattern => {
+    // basename-only patterns (e.g. *.min.js)
+    if (!pattern.includes('/')) {
+      if (matchGlob(basename, pattern)) return true;
+    }
+    // **/prefix patterns
+    if (pattern.startsWith('**/')) {
+      const suffix = pattern.slice(3);
+      for (let i = 0; i < parts.length; i++) {
+        if (matchGlob(parts[i], suffix)) return true;
+      }
+    }
+    // **/dir/** patterns
+    if (pattern.startsWith('**/') && pattern.endsWith('/**')) {
+      const dir = pattern.slice(3, -3);
+      if (parts.includes(dir)) return true;
+    }
+    // prefix/path patterns (no **)
+    if (!pattern.startsWith('**') && filepath.includes(pattern)) return true;
+    return false;
+  });
+}
+
+function matchGlob(name, pattern) {
+  const re = pattern
+    .replace(/[.+^${}()|[\]\\]/g, '\\$&')
+    .replace(/\*/g, '[^/]*')
+    .replace(/\?/g, '[^/]');
+  return new RegExp(`^${re}$`).test(name);
+}
+
+function filterIgnored(filenames) {
+  return filenames.filter(f => !isOxfmtIgnored(f));
+}
+
+export default {
+  '*.{js,jsx,ts,tsx,vue,mjs,cjs}': filenames => {
+    const filtered = filterIgnored(filenames);
+    if (filtered.length === 0) return [];
+    return ['npm run lint:fix', `npm run format:fix -- ${filtered.join(' ')}`];
+  },
+  '*.{json,yaml,yml,md,css,scss,html}': filenames => {
+    const filtered = filterIgnored(filenames);
+    if (filtered.length === 0) return [];
+    return [`npm run format:fix -- ${filtered.join(' ')}`];
+  },
+};

package/oxfmt.config.ts

@@ -7,12 +7,15 @@ export default defineConfig(
       // root original
       '**/.claude',
       '**/.vscode',
-      'CHANGELOG.md',
       // file type patterns (from vona & zova)
       '*.min.js',
       '*.code-snippets',
       // glob patterns (from vona & zova, already work from root)
       '**/dist/**',
+      '**/package-lock.json',
+      '**/yarn.lock',
+      '**/pnpm-lock.yaml',
+      '**/bun.lockb',
       '**/static/**',
       '**/.rollup.cache/**',
       '**/.metadata/index.ts',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.10",
+  "version": "5.1.11",
   "description": "A Node.js fullstack framework",
   "keywords": [
     "cabloy",
@@ -41,7 +41,7 @@
     "prepare": "husky"
   },
   "devDependencies": {
-    "@cabloy/lint": "^5.1.18",
+    "@cabloy/lint": "^5.1.21",
     "@cabloy/process-helper": "^3.1.3",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.19.17",
@@ -57,15 +57,6 @@
     "textlint-rule-period-in-list-item": "^1.0.1",
     "typescript": "^5.9.3"
   },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx,vue,mjs,cjs}": [
-      "npm run lint:fix",
-      "npm run format:fix"
-    ],
-    "*.{json,yaml,yml,md,css,scss,html}": [
-      "npm run format:fix"
-    ]
-  },
   "engines": {
     "node": ">=24.4.0"
   },

package/vona/packages-utils/lint/api/tsconfig.base.esm.json

@@ -1,4 +1,32 @@
 {
-  "extends": "./tsconfig.base.cjs",
-  "compilerOptions": {}
+  "compilerOptions": {
+    "incremental": true,
+    "composite": true,
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "resolveJsonModule": true,
+    "resolvePackageJsonImports": true,
+    "allowJs": false,
+    "checkJs": false,
+    "strict": true,
+    "strictPropertyInitialization": false,
+    "noImplicitAny": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "declaration": true,
+    "declarationMap": false,
+    "noEmit": false,
+    "noEmitOnError": true,
+    "sourceMap": false,
+    "stripInternal": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
+  }
 }

package/vona/packages-utils/lint/package.json

@@ -1,19 +1,36 @@
 {
   "name": "@cabloy/lint",
-  "version": "5.1.18",
+  "version": "5.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Node Style Guide for Cabloy.",
   "files": [
     "api",
-    "common",
-    "front",
-    "oxc"
+    "src",
+    "dist"
   ],
   "type": "module",
-  "main": "index.js",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./api/tsconfig.base.esm": "./api/tsconfig.base.esm.json",
+    "./package.json": "./package.json"
+  },
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
+    "tsc:publish": "npm run clean && tsc",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
   "dependencies": {
     "@e18e/eslint-plugin": "^0.2.0",
     "@eslint/json": "^1.2.0",
@@ -33,5 +50,23 @@
     "eslint-plugin-yml": "^3.3.2",
     "globals": "^17.4.0",
     "typescript-eslint": "^8.58.1"
+  },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "oxfmt": "^0.45.0",
+    "oxlint": "^1.65.0",
+    "rimraf": "^6.1.3"
+  },
+  "peerDependencies": {
+    "oxfmt": ">=0.45.0",
+    "oxlint": ">=1.65.0"
+  },
+  "clean-package": {
+    "indent": 2,
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
   }
 }

package/vona/packages-utils/lint/src/index.ts

@@ -0,0 +1,3 @@
+export * from './oxc/format.ts';
+export * from './oxc/lint.ts';
+export * from './oxc/lintVue.ts';

package/vona/packages-utils/lint/{oxc/format.js → src/oxc/format.ts}

@@ -1,4 +1,6 @@
-export const _configDefault = {
+import type { OxfmtConfig } from 'oxfmt';
+
+const _configDefault: OxfmtConfig = {
   printWidth: 100,
   tabWidth: 2,
   useTabs: false,
@@ -32,6 +34,6 @@ export const _configDefault = {
   ],
 };
 
-export function oxcFormatConfig(configCustom) {
+export function oxcFormatConfig(configCustom: OxfmtConfig = {}): OxfmtConfig {
   return Object.assign({}, _configDefault, configCustom);
 }

package/vona/packages-utils/lint/{oxc/lint.js → src/oxc/lint.ts}

@@ -1,4 +1,8 @@
-export const _configDefault = {
+import type { OxlintConfig } from 'oxlint';
+
+export type { OxlintConfig as LintConfig };
+
+const _configDefault: OxlintConfig = {
   plugins: ['import', 'unicorn'],
   jsPlugins: [
     'eslint-plugin-antfu',
@@ -261,7 +265,6 @@ export const _configDefault = {
     'e18e/prefer-date-now': 'error',
     'e18e/prefer-regex-test': 'error',
     'e18e/prefer-array-some': 'error',
-    'e18e/prefer-static-regex': 'error',
     'unicorn/consistent-empty-array-spread': 'error',
     'unicorn/error-message': 'error',
     'unicorn/escape-case': 'error',
@@ -708,7 +711,6 @@ export const _configDefault = {
         'vitest/prefer-hooks-in-order': 'error',
         'vitest/prefer-lowercase-title': 'error',
         'antfu/no-top-level-await': 'off',
-        'e18e/prefer-static-regex': 'off',
         'no-unused-expressions': 'off',
         '@typescript-eslint/explicit-function-return-type': 'off',
       },
@@ -1157,10 +1159,9 @@ export const _configDefault = {
       jsPlugins: ['@stylistic/eslint-plugin', 'eslint-plugin-toml'],
     },
     {
-      files: ['**/*.md/**/*.?([cm])[jt]s?(x)'],
+      files: ['**/*.md/**/*.?([cm])[jt]s?(x)', '**/*.md/**/*.vue'],
       rules: {
         'antfu/no-top-level-await': 'off',
-        'e18e/prefer-static-regex': 'off',
         'no-alert': 'off',
         'no-console': 'off',
         'no-labels': 'off',
@@ -1244,7 +1245,6 @@ export const _configDefault = {
       files: ['**/*.ts', '**/*.tsx'],
       rules: {
         'e18e/prefer-object-has-own': 'off',
-        'e18e/prefer-static-regex': 'off',
         'e18e/prefer-array-at': 'off',
         'e18e/prefer-regex-test': 'off',
         'regexp/no-unused-capturing-group': 'off',
@@ -1381,6 +1381,6 @@ export const _configDefault = {
   ],
 };
 
-export function oxcLintConfig(configCustom) {
+export function oxcLintConfig(configCustom: OxlintConfig = {}): OxlintConfig {
   return Object.assign({}, _configDefault, configCustom);
 }

package/vona/packages-utils/lint/{oxc/lintVue.js → src/oxc/lintVue.ts}

@@ -1,4 +1,6 @@
-export const _configDefault = {
+import type { OxlintConfig } from 'oxlint';
+
+const _configDefault: OxlintConfig = {
   plugins: ['import', 'unicorn'],
   jsPlugins: [
     'eslint-plugin-antfu',
@@ -261,7 +263,6 @@ export const _configDefault = {
     'e18e/prefer-date-now': 'error',
     'e18e/prefer-regex-test': 'error',
     'e18e/prefer-array-some': 'error',
-    'e18e/prefer-static-regex': 'error',
     'unicorn/consistent-empty-array-spread': 'error',
     'unicorn/error-message': 'error',
     'unicorn/escape-case': 'error',
@@ -708,7 +709,6 @@ export const _configDefault = {
         'vitest/prefer-hooks-in-order': 'error',
         'vitest/prefer-lowercase-title': 'error',
         'antfu/no-top-level-await': 'off',
-        'e18e/prefer-static-regex': 'off',
         'no-unused-expressions': 'off',
         '@typescript-eslint/explicit-function-return-type': 'off',
       },
@@ -1180,7 +1180,6 @@ export const _configDefault = {
       files: ['**/*.md/**/*.?([cm])[jt]s?(x)', '**/*.md/**/*.vue'],
       rules: {
         'antfu/no-top-level-await': 'off',
-        'e18e/prefer-static-regex': 'off',
         'no-alert': 'off',
         'no-console': 'off',
         'no-labels': 'off',
@@ -1264,7 +1263,6 @@ export const _configDefault = {
       files: ['**/*.ts', '**/*.tsx'],
       rules: {
         'e18e/prefer-object-has-own': 'off',
-        'e18e/prefer-static-regex': 'off',
         'e18e/prefer-array-at': 'off',
         'e18e/prefer-regex-test': 'off',
         'regexp/no-unused-capturing-group': 'off',
@@ -1401,6 +1399,6 @@ export const _configDefault = {
   ],
 };
 
-export function oxcLintConfigVue(configCustom) {
+export function oxcLintConfigVue(configCustom: OxlintConfig = {}): OxlintConfig {
   return Object.assign({}, _configDefault, configCustom);
 }

package/vona/packages-utils/lint/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "extends": "./api/tsconfig.base.esm",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "target": "esnext",
+    "module": "nodenext",
+    "allowImportingTsExtensions": true,
+    "rewriteRelativeImportExtensions": true,
+    "verbatimModuleSyntax": true,
+    "declaration": true
+  },
+  "include": ["src/**/*"]
+}