cabloy 5.1.225 → 5.1.227

package/vona/oxlint.config.ts

@@ -1,7 +1,9 @@
 import { oxcLintConfig } from '@cabloy/lint';
 import { defineConfig } from 'oxlint';
 
-export default defineConfig(
+import { resolveOxlintPlugins } from '../scripts/oxlintPlugins.ts';
+
+const config = defineConfig(
   oxcLintConfig({
     ignorePatterns: [
       '**/node_modules',
@@ -55,3 +57,5 @@ export default defineConfig(
     ],
   }),
 );
+
+export default resolveOxlintPlugins(config);

package/vona/package.original.json

@@ -26,10 +26,9 @@
     "dev:one": "npm run prerun && npm run vona :bin:dev -- --workers=1 --flavor=normal",
     "test": "node ../scripts/runIsolatedTest.ts unit",
     "cov": "node ../scripts/runIsolatedTest.ts unit --coverage",
-    "tsc": "npm run prerun && npm run vona :bin:tsc",
-    "tsc:native": "npm run prerun && npm run vona :bin:tsc -- --compiler=native",
-    "tsc:native:force": "npm run prerun && npm run vona :bin:tsc -- --compiler=native --force",
-    "tsc:legacy": "npm run prerun && npm run vona :bin:tsc -- --force",
+    "tsc": "npm run tsc:native",
+    "tsc:native": "npm run prerun && node ../scripts/typecheck.ts native vona --noEmit --incremental false --project tsconfig.json",
+    "tsc:legacy": "npm run prerun && node ../scripts/typecheck.ts typescript vona --noEmit --incremental false --project tsconfig.json",
     "build": "npm run prerun && npm run vona :bin:build -- --flavor=normal",
     "build:docker": "npm run prerun && npm run vona :bin:build -- --flavor=docker",
     "start": "pnpm -C ./dist/normal install && node ./dist/normal/bootstrap.js",
@@ -51,7 +50,7 @@
     "textlint-rule-ja-no-mixed-period": "^3.0.2",
     "textlint-rule-ja-space-between-half-and-full-width": "^2.4.2",
     "textlint-rule-period-in-list-item": "^1.0.1",
-    "oxfmt": "^0.62.0",
-    "oxlint": "^1.77.0"
+    "oxfmt": "^0.74.0",
+    "oxlint": "^1.89.0"
   }
 }

package/vona/packages-cli/cabloy-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/cli",
-  "version": "3.1.30",
+  "version": "3.1.31",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "@cabloy/cli",
   "keywords": [

package/vona/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.169",
+  "version": "1.1.170",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.167",
+  "version": "1.1.168",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

package/vona/packages-cli/cli-set-api/src/lib/beans.ts

@@ -5,7 +5,6 @@ import { CliBinDbReset } from './bean/cli.bin.dbReset.ts';
 import { CliBinDev } from './bean/cli.bin.dev.ts';
 import { CliBinPlay } from './bean/cli.bin.play.ts';
 import { CliBinTest } from './bean/cli.bin.test.ts';
-import { CliBinTsc } from './bean/cli.bin.tsc.ts';
 import { CliCreateBean } from './bean/cli.create.bean.ts';
 import { CliCreateModule } from './bean/cli.create.module.ts';
 import { CliCreateSuite } from './bean/cli.create.suite.ts';
@@ -38,7 +37,6 @@ export const beans = {
   'bin.play': CliBinPlay,
   'bin.dev': CliBinDev,
   'bin.test': CliBinTest,
-  'bin.tsc': CliBinTsc,
   'create.suite': CliCreateSuite,
   'create.bean': CliCreateBean,
   'create.module': CliCreateModule,

package/vona/packages-cli/cli-set-api/src/lib/commands.ts

@@ -5,7 +5,6 @@ import binDbReset from './command/bin.dbReset.ts';
 import binDev from './command/bin.dev.ts';
 import binPlay from './command/bin.play.ts';
 import binTest from './command/bin.test.ts';
-import binTsc from './command/bin.tsc.ts';
 import createBean from './command/create.bean.ts';
 import createModule from './command/create.module.ts';
 import createSuite from './command/create.suite.ts';
@@ -41,7 +40,6 @@ export const commands = {
     dev: binDev,
     play: binPlay,
     test: binTest,
-    tsc: binTsc,
   },
   create: {
     suite: createSuite,

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

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/lint",
-  "version": "5.1.35",
+  "version": "5.1.36",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Node Style Guide for Cabloy.",
   "files": [
@@ -52,8 +52,8 @@
   },
   "devDependencies": {
     "clean-package": "^2.2.0",
-    "oxfmt": "^0.62.0",
-    "oxlint": "^1.77.0",
+    "oxfmt": "^0.74.0",
+    "oxlint": "^1.89.0",
     "rimraf": "^6.1.3"
   },
   "peerDependencies": {

package/vona/packages-utils/module-glob/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.3.18",
+  "version": "5.3.19",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "cabloy module-glob",
   "keywords": [
@@ -27,6 +27,7 @@
     "access": "public"
   },
   "scripts": {
+    "test": "node --test test/*.test.ts",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
     "tsc:publish": "npm run clean && node ../../packages-cli/cli/src/bin/vona.ts :bin:buildGeneral && tsc",
     "prepublishOnly": "npm run tsc:publish",

package/vona/packages-utils/module-glob/src/index.ts

@@ -13,6 +13,7 @@ import semver from 'semver';
 import type { IModuleGlobContext, IModuleGlobOptions } from './interface.ts';
 
 import { getPathsMeta } from './meta.ts';
+import { bindSuitesModules } from './suites.ts';
 
 export * from './interface.ts';
 
@@ -61,7 +62,7 @@ export async function glob(options: IModuleGlobOptions) {
   await __loadPackage(context, suites);
   await __loadPackage(context, modules);
   // bind suites modules
-  __bindSuitesModules(suites, modules);
+  bindSuitesModules(suites, modules);
 
   // check suites
   __checkSuites(context, suites);
@@ -401,31 +402,6 @@ function __parseSuites(context: IModuleGlobContext, projectPath) {
   return suites;
 }
 
-const __suite_pattern1 = /src\/suite\/([^/]+)\/modules/;
-const __suite_pattern2 = /src\/suite-vendor\/([^/]+)\/modules/;
-function __bindSuitesModules(suites, modules) {
-  for (const moduleName in modules) {
-    const module = modules[moduleName];
-    // check
-    let res = module.root.match(__suite_pattern1);
-    if (!res) {
-      res = module.root.match(__suite_pattern2);
-    }
-    if (!res) continue;
-    // suiteName
-    const suiteName = res[1];
-    const suite = suites[suiteName];
-    if (!suite) {
-      // means disabled
-      delete modules[moduleName];
-    } else {
-      // bind
-      module.suite = suiteName;
-      suite.modules.push(moduleName);
-    }
-  }
-}
-
 function __checkSuites(context: IModuleGlobContext, suites: Record<string, ISuite>) {
   for (const key in suites) {
     const suite = suites[key];

package/vona/packages-utils/module-glob/src/suites.ts

@@ -0,0 +1,31 @@
+import type { IModule, ISuite } from '@cabloy/module-info';
+
+const __suite_pattern1 = /src\/suite\/([^/]+)\/modules/;
+const __suite_pattern2 = /src\/suite-vendor\/([^/]+)\/modules/;
+
+export function bindSuitesModules(
+  suites: Record<string, ISuite>,
+  modules: Record<string, IModule>,
+) {
+  for (const moduleName in modules) {
+    const module = modules[moduleName];
+    // check
+    const root = module.root.replace(/\\/g, '/');
+    let res = root.match(__suite_pattern1);
+    if (!res) {
+      res = root.match(__suite_pattern2);
+    }
+    if (!res) continue;
+    // suiteName
+    const suiteName = res[1];
+    const suite = suites[suiteName];
+    if (!suite) {
+      // means disabled
+      delete modules[moduleName];
+    } else {
+      // bind
+      module.suite = suiteName;
+      suite.modules.push(moduleName);
+    }
+  }
+}

package/vona/packages-utils/module-glob/test/suites.test.ts

@@ -0,0 +1,108 @@
+import type { IModule, ISuite } from '@cabloy/module-info';
+
+import { parseInfoPro } from '@cabloy/module-info';
+import assert from 'node:assert/strict';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { test } from 'node:test';
+
+import { glob } from '../src/index.ts';
+import { bindSuitesModules } from '../src/suites.ts';
+
+function createModule(name: string, root: string): IModule {
+  const info = parseInfoPro(name, 'vona', 'module');
+  assert.ok(info);
+  return { name, info, root, pkg: '', package: { name, version: '1.0.0' } };
+}
+
+function createSuite(name: string, root: string): ISuite {
+  const info = parseInfoPro(name, 'vona', 'suite');
+  assert.ok(info);
+  return { name, info, root, pkg: '', package: { name, version: '1.0.0' }, modules: [] };
+}
+
+for (const [platform, paths, projectPath] of [
+  ['POSIX', path.posix, '/project with spaces/vona'],
+  ['Windows', path.win32, 'C:\\project with spaces\\vona'],
+] as const) {
+  for (const directory of ['suite', 'suite-vendor']) {
+    test(`binds ${platform} ${directory} members without duplicate standalone checks`, () => {
+      const root = paths.join(projectPath, 'src', directory, 'a-example');
+      const suite = createSuite('a-example', root);
+      const first = createModule('a-first', paths.join(root, 'modules', 'a-first'));
+      const second = createModule('a-second', paths.join(root, 'modules', 'a-second'));
+      const standalone = createModule(
+        'a-standalone',
+        paths.join(projectPath, 'src', 'module', 'a-standalone'),
+      );
+      const orphan = createModule(
+        'a-orphan',
+        paths.join(projectPath, 'src', directory, 'a-missing', 'modules', 'a-orphan'),
+      );
+      const suites = { 'a-example': suite };
+      const modules = {
+        'a-first': first,
+        'a-second': second,
+        'a-standalone': standalone,
+        'a-orphan': orphan,
+      };
+
+      bindSuitesModules(suites, modules);
+
+      assert.equal(first.suite, 'a-example');
+      assert.equal(second.suite, 'a-example');
+      assert.deepEqual(suite.modules, ['a-first', 'a-second']);
+      assert.equal(first.root, paths.join(root, 'modules', 'a-first'));
+      assert.equal(standalone.suite, undefined);
+      assert.equal('a-orphan' in modules, false);
+      const independent = Object.values(modules).filter(
+        item => !item.suite && !item.info.node_modules,
+      );
+      assert.deepEqual(
+        independent.map(item => item.name),
+        ['a-standalone'],
+      );
+      assert.equal(1 + Object.keys(suites).length + independent.length, 3);
+    });
+  }
+}
+
+test('glob binds suite members and excludes members of disabled suites', async () => {
+  const projectPath = await mkdtemp(path.join(tmpdir(), 'cabloy-module-glob-'));
+  try {
+    for (const directory of [
+      'src/suite/a-local',
+      'src/suite/a-local/modules/a-first',
+      'src/suite-vendor/a-vendor',
+      'src/suite-vendor/a-vendor/modules/a-second',
+      'src/module/a-standalone',
+    ]) {
+      const root = path.join(projectPath, directory);
+      await mkdir(root, { recursive: true });
+      await writeFile(
+        path.join(root, 'package.json'),
+        JSON.stringify({ name: directory.split('/').at(-1), version: '1.0.0' }),
+      );
+    }
+    const options = { projectPath, projectMode: 'vona', log: false } as const;
+    const meta = await glob(options);
+    assert.equal(meta.modules['a-first'].suite, 'a-local');
+    assert.equal(meta.modules['a-second'].suite, 'a-vendor');
+    assert.deepEqual(meta.suites['a-local'].modules, ['a-first']);
+    assert.deepEqual(meta.suites['a-vendor'].modules, ['a-second']);
+    assert.deepEqual(
+      meta.modulesArray.filter(item => !item.suite).map(item => item.name),
+      ['a-standalone'],
+    );
+
+    const disabled = await glob({ ...options, disabledSuites: ['a-local', 'a-vendor'] });
+    assert.deepEqual(Object.keys(disabled.suites), []);
+    assert.deepEqual(
+      disabled.modulesArray.map(item => item.name),
+      ['a-standalone'],
+    );
+  } finally {
+    await rm(projectPath, { recursive: true, force: true });
+  }
+});

package/vona/packages-vona/vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.114",
+  "version": "5.1.116",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [