@bleedingdev/modern-js-code-tools 3.9.0-ultramodern.9 → 3.9.3-ultramodern.2

package/bin/modern-api-check-files.mjs

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
 import { runMicroVerticalApiCheckCli } from '../dist/esm-node/cli/microvertical-api-check.js';
 
-process.exitCode = runMicroVerticalApiCheckCli(process.argv.slice(2), true);
+process.exitCode = await runMicroVerticalApiCheckCli(
+  process.argv.slice(2),
+  true,
+);

package/bin/modern-api-check.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 import { runMicroVerticalApiCheckCli } from '../dist/esm-node/cli/microvertical-api-check.js';
 
-process.exitCode = runMicroVerticalApiCheckCli();
+process.exitCode = await runMicroVerticalApiCheckCli();

package/bin/modern-i18n-check.mjs

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+import { runWorkspaceSourceCheckCli } from '../dist/esm-node/cli/workspace-source-check.js';
+
+process.exitCode = runWorkspaceSourceCheckCli();

package/dist/cjs/cli/microvertical-api-check.cjs

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -30,30 +39,50 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     runMicroVerticalApiCheckCli: ()=>runMicroVerticalApiCheckCli
 });
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const external_node_url_namespaceObject = require("node:url");
 const external_microvertical_api_boundary_cjs_namespaceObject = require("../microvertical-api-boundary.cjs");
-function runMicroVerticalApiCheckCli(args = process.argv.slice(2), filesOnly = false) {
+const flags = [
+    '--workspace-root',
+    '--baseline-package-directory',
+    '--rules'
+];
+async function loadSourceRules(file) {
+    const rules = (await import((0, external_node_url_namespaceObject.pathToFileURL)(external_node_path_default().resolve(file)).href)).default;
+    if (!Array.isArray(rules) || !rules.every((rule)=>'function' == typeof rule)) throw new Error(`${file}: default export must be an array of source rule functions, e.g. \`export default [myRule]\``);
+    return rules;
+}
+async function runMicroVerticalApiCheckCli(args = process.argv.slice(2), filesOnly = false) {
     let workspaceRoot = process.env.ULTRAMODERN_WORKSPACE_ROOT ?? process.cwd();
     let baselinePackageDirectory;
+    const ruleFiles = [];
     for(let index = 0; index < args.length; index += 1){
         const argument = args[index];
         if ('--help' === argument || '-h' === argument) {
-            console.log(`${filesOnly ? 'modern-api-check-files' : 'modern-api-check'} [--workspace-root <path>] [--baseline-package-directory <path>]\n${filesOnly ? 'Checks consumer files, contracts, package exports and owner identity. Does not analyze runtime topology; run the strict Effect source phase separately.' : 'Checks consumer files, contracts, package exports, owner identity and runtime topology once per API entry.'}\nWorkspace defaults to ULTRAMODERN_WORKSPACE_ROOT then cwd. Exit codes: 0 valid, 1 consumer violation, 2 tool/configuration failure.`);
+            console.log(`${filesOnly ? 'modern-api-check-files' : 'modern-api-check'} [--workspace-root <path>] [--baseline-package-directory <path>] [--rules <module>]...\n${filesOnly ? 'Checks consumer files, contracts, package exports and owner identity. Does not analyze runtime topology; run the strict Effect source phase separately.' : 'Checks consumer files, contracts, package exports, owner identity and runtime topology once per API entry.'}\nThe baseline owner defaults to each contract's native package resolver. --baseline-package-directory requires that exact installed owner for every contract.\n--rules loads a module whose default export is an array of source rules; each rule runs once per workspace source file with the shared module graph.\nWorkspace defaults to ULTRAMODERN_WORKSPACE_ROOT then cwd. Exit codes: 0 valid, 1 consumer violation, 2 tool/configuration failure.`);
             return 0;
         }
-        if (![
-            '--workspace-root',
-            '--baseline-package-directory'
-        ].includes(argument ?? '') || !args[index + 1] || args[index + 1]?.startsWith('--')) {
+        if (!flags.includes(argument ?? '') || !args[index + 1] || args[index + 1]?.startsWith('--')) {
             console.error(`Invalid argument: ${argument ?? ''}. Use --help.`);
             return 2;
         }
         const value = args[++index];
         if ('--workspace-root' === argument) workspaceRoot = value;
+        else if ('--rules' === argument) ruleFiles.push(value);
         else baselinePackageDirectory = value;
     }
+    const sourceRules = [];
+    for (const file of ruleFiles)try {
+        sourceRules.push(...await loadSourceRules(file));
+    } catch (error) {
+        console.error(`API tool error: --rules ${error instanceof Error ? error.message : String(error)}`);
+        return 2;
+    }
     const result = (filesOnly ? external_microvertical_api_boundary_cjs_namespaceObject.checkMicroVerticalApiConsumerFiles : external_microvertical_api_boundary_cjs_namespaceObject.checkMicroVerticalApiBoundaries)({
         workspaceRoot,
-        baselinePackageDirectory
+        baselinePackageDirectory,
+        sourceRules
     });
     for (const diagnostic of result.diagnostics)console.error(`API violation: ${diagnostic}`);
     for (const error of result.toolErrors)console.error(`API tool error: ${error}`);

package/dist/cjs/cli/workspace-source-check.cjs

@@ -37,8 +37,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    main: ()=>main,
-    runWorkspaceSourceCheck: ()=>runWorkspaceSourceCheck
+    runWorkspaceSourceCheck: ()=>runWorkspaceSourceCheck,
+    runWorkspaceSourceCheckCli: ()=>runWorkspaceSourceCheckCli
 });
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
@@ -50,6 +50,11 @@ const DEFAULT_LOCALES = [
     'en',
     'cs'
 ];
+const DEFAULT_SOURCE_ROOTS = [
+    'apps',
+    'verticals',
+    'packages'
+];
 const ignoredDirectories = new Set([
     '.modern',
     '.modernjs',
@@ -83,6 +88,8 @@ const createLocaleJsonMatcher = (locales)=>{
 const resolvePluralCategories = (locale, overrides)=>overrides?.[locale] ?? new Intl.PluralRules(locale).resolvedOptions().pluralCategories;
 const readText = (filePath)=>external_node_fs_default().readFileSync(filePath, 'utf-8');
 const localeImportPattern = (locale)=>new RegExp(`import\\s+(?:\\*\\s+as\\s+)?[A-Za-z_$][\\w$]*\\s+from\\s+['"]\\.\\./locales/${escapeRegExp(locale)}/[^'"]+\\.json['"]`, 'u');
+class SourceViolation extends Error {
+}
 const checkRuntimeResources = (root, filePath, text, locales)=>{
     const relative = relativePath(root, filePath);
     if (!relative.endsWith('/src/modern.runtime.ts')) return;
@@ -90,7 +97,7 @@ const checkRuntimeResources = (root, filePath, text, locales)=>{
     const registersResources = /initOptions\s*:\s*\{[\s\S]*?\bresources\s*[,:}]/u.test(text);
     if (missingLocales.length > 0 || !registersResources) {
         const detail = missingLocales.length > 0 ? `missing locale JSON imports for: ${missingLocales.join(', ')}` : 'initOptions does not register a `resources` entry';
-        throw new Error(`${relative} must register locale JSON resources in modern.runtime.ts so Worker SSR and hydration use the same first-render translations (${detail}).`);
+        throw new SourceViolation(`${relative} must register locale JSON resources in modern.runtime.ts so Worker SSR and hydration use the same first-render translations (${detail}).`);
     }
 };
 const visitLocaleKeys = (value, visitor, pathParts = [])=>{
@@ -110,7 +117,7 @@ const checkPluralResources = (root, filePath, json, requiredSuffixes, pluralSuff
     visitLocaleKeys(json, (key, value, pathParts)=>{
         if ('string' != typeof value || !value.includes('{{count}}')) return;
         const suffixMatch = key.match(pluralSuffixPattern);
-        if (!suffixMatch) throw new Error(`${relative} key ${pathParts.join('.')} contains {{count}} but is not plural-suffixed.`);
+        if (!suffixMatch) throw new SourceViolation(`${relative} key ${pathParts.join('.')} contains {{count}} but is not plural-suffixed.`);
         const [, base = '', suffix = ''] = suffixMatch;
         const parentPath = pathParts.slice(0, -1).join('.');
         const groupKey = `${parentPath}.${base}`;
@@ -118,7 +125,7 @@ const checkPluralResources = (root, filePath, json, requiredSuffixes, pluralSuff
         existing.add(suffix);
         groups.set(groupKey, existing);
     });
-    for (const [group, suffixes] of groups)for (const suffix of requiredSuffixes)if (!suffixes.has(suffix)) throw new Error(`${relative} plural group ${group} is missing _${suffix}.`);
+    for (const [group, suffixes] of groups)for (const suffix of requiredSuffixes)if (!suffixes.has(suffix)) throw new SourceViolation(`${relative} plural group ${group} is missing _${suffix}.`);
 };
 const runRuntimeAndLocaleResourceChecks = (root, sourceRoots, locales, pluralCategories)=>{
     if (0 === locales.length) return;
@@ -140,11 +147,7 @@ const runRuntimeAndLocaleResourceChecks = (root, sourceRoots, locales, pluralCat
         checkPluralResources(root, filePath, JSON.parse(readText(filePath)), localeCategories.get(language) ?? [], pluralSuffixPattern);
     }
 };
-const runWorkspaceSourceCheck = ({ cwd = process.cwd(), sourceRoots = [
-    'apps',
-    'verticals',
-    'packages'
-], locales = DEFAULT_LOCALES, pluralCategories } = {})=>{
+const runWorkspaceSourceCheck = ({ cwd = process.cwd(), sourceRoots = DEFAULT_SOURCE_ROOTS, locales = DEFAULT_LOCALES, pluralCategories } = {})=>{
     const oxlintResult = (0, external_oxlint_cjs_namespaceObject.runOxlintRules)({
         cwd,
         targets: sourceRoots,
@@ -177,20 +180,90 @@ const runWorkspaceSourceCheck = ({ cwd = process.cwd(), sourceRoots = [
     try {
         runRuntimeAndLocaleResourceChecks(cwd, sourceRoots, locales, pluralCategories);
     } catch (error) {
-        console.error(error instanceof Error ? error.message : 'UltraModern workspace source checks failed.');
-        return 1;
+        console.error(error instanceof Error ? error.message : String(error));
+        return error instanceof SourceViolation ? 1 : 2;
     }
     console.log(WORKSPACE_SOURCE_SUCCESS);
     return 0;
 };
-const main = ()=>{
-    process.exitCode = runWorkspaceSourceCheck();
+const USAGE = `modern-i18n-check [--workspace-root <path>]
+Runs the UltraModern i18n and boundary source checks for a workspace.
+Workspace defaults to ULTRAMODERN_WORKSPACE_ROOT then cwd. Options come from
+package.json "modernjs.i18nCheck": { sourceRoots, locales, pluralCategories }.
+Exit codes: 0 valid, 1 source violation, 2 tool/configuration failure.`;
+const isStringArray = (value)=>Array.isArray(value) && value.every((entry)=>'string' == typeof entry && entry.length > 0);
+const isLocaleArray = (value)=>{
+    if (!isStringArray(value)) return false;
+    try {
+        Intl.getCanonicalLocales(value);
+        return true;
+    } catch  {
+        return false;
+    }
+};
+const isRecord = (value)=>'object' == typeof value && null !== value && !Array.isArray(value);
+const isWorkspaceDirectory = (root, entry)=>{
+    if (external_node_path_default().isAbsolute(entry)) return false;
+    const target = external_node_path_default().resolve(root, entry);
+    if (!external_node_fs_default().existsSync(target) || !external_node_fs_default().statSync(target).isDirectory()) return false;
+    const relative = external_node_path_default().relative(external_node_fs_default().realpathSync(root), external_node_fs_default().realpathSync(target));
+    return '' !== relative && '..' !== relative && !relative.startsWith(`..${external_node_path_default().sep}`) && !external_node_path_default().isAbsolute(relative);
+};
+const CLDR_PLURAL_CATEGORIES = new Set([
+    'zero',
+    'one',
+    'two',
+    'few',
+    'many',
+    'other'
+]);
+const isPluralCategories = (value)=>isRecord(value) && Object.values(value).every((categories)=>isStringArray(categories) && categories.includes('other') && categories.every((category)=>CLDR_PLURAL_CATEGORIES.has(category)));
+const readWorkspaceCheckOptions = (root)=>{
+    const manifestPath = external_node_path_default().join(root, 'package.json');
+    const modernjs = JSON.parse(readText(manifestPath)).modernjs;
+    const config = isRecord(modernjs) && Object.hasOwn(modernjs, 'i18nCheck') ? modernjs.i18nCheck : {};
+    const invalid = (field, expected)=>new Error(`${manifestPath} "modernjs.i18nCheck${field}" must be ${expected}.`);
+    if (!isRecord(config)) throw invalid('', 'an object');
+    const { locales, pluralCategories } = config;
+    if (void 0 !== locales && !isLocaleArray(locales)) throw invalid('.locales', 'an array of BCP 47 locale codes');
+    if (void 0 !== pluralCategories && !isPluralCategories(pluralCategories)) throw invalid('.pluralCategories', 'an object of locale -> CLDR plural categories including "other"');
+    const sourceRoots = Object.hasOwn(config, 'sourceRoots') ? config.sourceRoots : DEFAULT_SOURCE_ROOTS.filter((entry)=>isWorkspaceDirectory(root, entry));
+    if (!isStringArray(sourceRoots) || 0 === sourceRoots.length || !sourceRoots.every((entry)=>isWorkspaceDirectory(root, entry))) throw invalid('.sourceRoots', `a non-empty array of existing workspace-relative directories (default: whichever of ${DEFAULT_SOURCE_ROOTS.join(', ')} exist)`);
+    return {
+        cwd: root,
+        sourceRoots,
+        locales,
+        pluralCategories
+    };
+};
+const runWorkspaceSourceCheckCli = (args = process.argv.slice(2))=>{
+    let workspaceRoot = process.env.ULTRAMODERN_WORKSPACE_ROOT ?? process.cwd();
+    for(let index = 0; index < args.length; index += 1){
+        const argument = args[index];
+        if ('--help' === argument || '-h' === argument) {
+            console.log(USAGE);
+            return 0;
+        }
+        const value = args[index + 1];
+        if ('--workspace-root' !== argument || !value || value.startsWith('--')) {
+            console.error(`Invalid argument: ${argument ?? ''}. Use --help.`);
+            return 2;
+        }
+        workspaceRoot = value;
+        index += 1;
+    }
+    try {
+        return runWorkspaceSourceCheck(readWorkspaceCheckOptions(external_node_path_default().resolve(workspaceRoot)));
+    } catch (error) {
+        console.error(error instanceof Error ? error.message : String(error));
+        return 2;
+    }
 };
-exports.main = __webpack_exports__.main;
 exports.runWorkspaceSourceCheck = __webpack_exports__.runWorkspaceSourceCheck;
+exports.runWorkspaceSourceCheckCli = __webpack_exports__.runWorkspaceSourceCheckCli;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "main",
-    "runWorkspaceSourceCheck"
+    "runWorkspaceSourceCheck",
+    "runWorkspaceSourceCheckCli"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true