@bleedingdev/modern-js-code-tools 3.9.0-ultramodern.8 → 3.9.3-ultramodern.1

package/dist/cjs/microvertical-api-boundary.cjs

@@ -40,6 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
     checkMicroVerticalApiBoundaries: ()=>checkMicroVerticalApiBoundaries,
     checkMicroVerticalApiConsumerFiles: ()=>checkMicroVerticalApiConsumerFiles,
     configuredMicroVerticalApiStem: ()=>external_microvertical_api_baseline_cjs_namespaceObject.configuredMicroVerticalApiStem,
+    createModuleGraph: ()=>external_module_graph_cjs_namespaceObject.createModuleGraph,
     microVerticalApiBaselineViolation: ()=>external_microvertical_api_baseline_cjs_namespaceObject.microVerticalApiBaselineViolation
 });
 const external_node_fs_namespaceObject = require("node:fs");
@@ -50,6 +51,8 @@ const parser_namespaceObject = require("@babel/parser");
 const types_namespaceObject = require("@babel/types");
 const external_microvertical_api_baseline_cjs_namespaceObject = require("./microvertical-api-baseline.cjs");
 const external_microvertical_api_owner_cjs_namespaceObject = require("./microvertical-api-owner.cjs");
+const external_module_graph_cjs_namespaceObject = require("./module-graph.cjs");
+const external_source_analysis_cjs_namespaceObject = require("./source-analysis.cjs");
 const external_strict_effect_runtime_cjs_namespaceObject = require("./strict-effect-runtime.cjs");
 const ignored = new Set([
     '.git',
@@ -65,13 +68,42 @@ const normalize = (file)=>file.split(external_node_path_default().sep).join('/')
 const errorMessage = (error)=>error instanceof Error ? error.message : String(error);
 const apiApp = (app)=>'vertical' === app.kind && 'ui-only' !== app.surfaceProfile && 'horizontal-remote' !== app.deliveryUnitKind;
 function configuredApps(root, supplied) {
-    const source = supplied ?? JSON.parse(external_node_fs_default().readFileSync(external_node_path_default().join(root, '.modernjs/ultramodern.json'), 'utf8')).topology?.apps;
-    if (!Array.isArray(source)) throw new Error('.modernjs/ultramodern.json: topology.apps must be an array');
+    const topology = supplied ? void 0 : JSON.parse(external_node_fs_default().readFileSync(external_node_path_default().join(root, 'topology/reference-topology.json'), 'utf8'));
+    if (topology && (!topology.shell || !Array.isArray(topology.verticals) || void 0 !== topology.shells && !Array.isArray(topology.shells))) throw new Error('topology/reference-topology.json: shell and verticals must be present');
+    const entries = topology?.shell ? [
+        topology.shell,
+        ...topology.shells ?? [],
+        ...topology.verticals ?? []
+    ] : void 0;
+    const source = supplied ?? entries?.map((entry)=>{
+        if (!entry || 'string' != typeof entry.path || !entry.path || external_node_path_default().isAbsolute(entry.path) || entry.path.split(/[\\/]/u).includes('..')) throw new Error('topology/reference-topology.json: each app must have an explicit workspace path');
+        const packageFile = external_node_path_default().join(root, entry.path, 'package.json');
+        const manifest = JSON.parse(external_node_fs_default().readFileSync(packageFile, 'utf8'));
+        if ('string' != typeof manifest.name || !manifest.name || void 0 !== entry.package && entry.package !== manifest.name) throw new Error(`${entry.path}/package.json: package name must match topology`);
+        const api = entry.api;
+        const stem = api?.stem ?? api?.readiness?.endpoint?.match(/^\/([a-z0-9]+(?:-[a-z0-9]+)*)\/readiness$/u)?.[1];
+        return {
+            id: entry.id,
+            kind: entry.kind,
+            path: entry.path,
+            package: manifest.name,
+            surfaceProfile: entry.surfaceProfile,
+            deliveryUnitKind: entry.deliveryUnitKind,
+            ...void 0 === api ? {} : {
+                api: {
+                    stem,
+                    prefix: api.bff?.prefix,
+                    protocol: api.protocol
+                }
+            }
+        };
+    });
+    if (!Array.isArray(source)) throw new Error('topology/reference-topology.json: shell and verticals must describe apps');
     const paths = new Set();
     for (const app of source){
-        if (!app || 'object' != typeof app || 'string' != typeof app.path || !app.path || external_node_path_default().isAbsolute(app.path) || app.path.split(/[\\/]/u).includes('..')) throw new Error('.modernjs/ultramodern.json: each app must have a relative workspace path');
+        if (!app || 'object' != typeof app || 'string' != typeof app.path || !app.path || external_node_path_default().isAbsolute(app.path) || app.path.split(/[\\/]/u).includes('..')) throw new Error('topology/reference-topology.json: each app must have a relative workspace path');
         const key = normalize(app.path);
-        if (paths.has(key)) throw new Error(`.modernjs/ultramodern.json: duplicate app path ${key}`);
+        if (paths.has(key)) throw new Error(`topology/reference-topology.json: duplicate app path ${key}`);
         paths.add(key);
         for (const name of [
             'id',
@@ -80,7 +112,7 @@ function configuredApps(root, supplied) {
             'surfaceProfile',
             'deliveryUnitKind'
         ])if (void 0 !== app[name] && 'string' != typeof app[name]) throw new Error(`${key}: ${name} must be a string`);
-        for (const [field, allowed] of Object.entries({
+        const allowedFields = {
             kind: [
                 'shell',
                 'vertical'
@@ -94,7 +126,11 @@ function configuredApps(root, supplied) {
                 'microvertical',
                 'horizontal-remote'
             ]
-        }))if (void 0 !== app[field] && !allowed.includes(app[field])) throw new Error(`${key}: invalid ${field}`);
+        };
+        for (const field of Object.keys(allowedFields)){
+            const value = app[field];
+            if (void 0 !== value && !allowedFields[field].includes(value)) throw new Error(`${key}: invalid ${field}`);
+        }
         if (void 0 !== app.api) {
             if (!app.api || 'object' != typeof app.api || Array.isArray(app.api)) throw new Error(`${key}: api must be an object`);
             if (void 0 !== app.api.protocol && ![
@@ -159,7 +195,7 @@ function check(options, topology) {
                 const ast = (0, parser_namespaceObject.parse)(read(file), {
                     sourceType: 'module',
                     sourceFilename: file,
-                    plugins: (0, external_microvertical_api_baseline_cjs_namespaceObject.consumerParserPlugins)(file)
+                    plugins: (0, external_source_analysis_cjs_namespaceObject.consumerParserPlugins)(file)
                 });
                 parsed.set(file, ast);
                 return ast;
@@ -182,12 +218,27 @@ function check(options, topology) {
                 `${base}/index.tsx`
             ].find((candidate)=>exists(candidate));
         };
-        const composedModules = (file)=>{
+        const clientExportFile = (appPath, exported)=>{
+            if ('string' != typeof exported || !exported.startsWith('./') || exported.split(/[\\/]/u).includes('..') || !/\.[cm]?[jt]sx?$/u.test(exported)) return;
+            const appDirectory = absolute(appPath);
+            const candidate = external_node_path_default().resolve(appDirectory, exported);
+            try {
+                const workspace = external_node_fs_default().realpathSync(root);
+                const owner = external_node_fs_default().realpathSync(appDirectory);
+                const real = external_node_fs_default().realpathSync(candidate);
+                if (!owner.startsWith(`${workspace}${external_node_path_default().sep}`) || !real.startsWith(`${owner}${external_node_path_default().sep}`) || !external_node_fs_default().statSync(real).isFile()) return;
+            } catch  {
+                return;
+            }
+            return normalize(external_node_path_default().relative(root, candidate));
+        };
+        const composedModules = (file, appPath)=>{
             const order = [];
             const seen = new Set();
             const queue = [
                 file
             ];
+            const owner = external_node_fs_default().realpathSync(absolute(appPath));
             while(queue.length > 0 && order.length < 128){
                 const current = queue.shift();
                 if (seen.has(current)) continue;
@@ -198,16 +249,19 @@ function check(options, topology) {
                 for (const statement of ast.program.body){
                     const source = (types_namespaceObject.isImportDeclaration(statement) || types_namespaceObject.isExportNamedDeclaration(statement) || types_namespaceObject.isExportAllDeclaration(statement)) && statement.source ? statement.source.value : void 0;
                     const resolved = void 0 === source ? void 0 : resolveRelative(current, source);
-                    if (void 0 !== resolved && !seen.has(resolved)) queue.push(resolved);
+                    if (void 0 !== resolved && !seen.has(resolved)) {
+                        const real = external_node_fs_default().realpathSync(absolute(resolved));
+                        if (real.startsWith(`${owner}${external_node_path_default().sep}`)) queue.push(resolved);
+                    }
                 }
             }
             return order;
         };
-        const moduleShape = (file, imports, calls, patterns = [], defaultExport, composed = false)=>{
+        const moduleShape = (file, imports, calls, patterns = [], defaultExport, composedAppPath)=>{
             if (!exists(file)) return;
             const ast = parseFile(file);
             if (!ast) return;
-            const shapeFiles = composed ? composedModules(file) : [
+            const shapeFiles = composedAppPath ? composedModules(file, composedAppPath) : [
                 file
             ];
             const body = shapeFiles.flatMap((shapeFile)=>parseFile(shapeFile)?.program.body ?? []);
@@ -300,7 +354,6 @@ function check(options, topology) {
                 if (violation) diagnostics.push(`${file}: ${violation}`);
             }
         });
-        let owner;
         for (const appPath of appDirectories)guarded(appPath, ()=>{
             const app = byPath.get(appPath);
             const emits = app ? apiApp(app) || 'vertical' !== app.kind && void 0 !== app.api : appPath.startsWith('verticals/') || exists(`${appPath}/api/index.ts`) || exists(`${appPath}/shared/api.ts`);
@@ -317,19 +370,25 @@ function check(options, topology) {
                 }
                 return;
             }
-            if (app?.kind === 'vertical') assert(void 0 !== app.api, `${appPath}: vertical must declare its Effect API in .modernjs/ultramodern.json`);
+            if (app?.kind === 'vertical') assert(void 0 !== app.api, `${appPath}: vertical must declare its Effect API in topology/reference-topology.json`);
             const stem = app?.api?.stem ?? external_node_path_default().posix.basename(appPath);
             const rpc = app?.api?.protocol === 'rpc';
             const contract = `${appPath}/shared/${rpc ? 'rpc' : 'api'}.ts`;
-            const client = `${appPath}/src/api/${stem}-${rpc ? 'rpc-client' : 'client'}.ts`;
             const entry = `${appPath}/api/index.ts`;
             for (const file of [
                 entry,
-                contract,
-                client
+                contract
             ])assert(exists(file), `${file}: required API surface is missing`);
+            const packageFile = `${appPath}/package.json`;
+            assert(exists(packageFile), `${packageFile}: required API package is missing`);
+            if (!exists(packageFile)) return;
+            const manifest = JSON.parse(read(packageFile));
+            assert(manifest.exports?.['./api'] === `./shared/${rpc ? 'rpc' : 'api'}.ts`, `${packageFile}: invalid ./api export`);
+            const clientKey = `./api/${rpc ? 'rpc-client' : 'client'}`;
+            const client = clientExportFile(appPath, manifest.exports?.[clientKey]);
+            assert(void 0 !== client, `${packageFile}: invalid API client export`);
+            assert(manifest.exports?.[`./api/${rpc ? 'client' : 'rpc-client'}`] === void 0, `${packageFile}: forbidden opposite protocol client export`);
             noPath(`${appPath}/shared/${rpc ? 'api' : 'rpc'}.ts`, `must not emit a ${rpc ? 'REST' : 'RPC'} contract`);
-            noPath(`${appPath}/src/api/${stem}-${rpc ? 'client' : 'rpc-client'}.ts`, `must not emit a ${rpc ? 'REST' : 'RPC'} client`);
             if (rpc) {
                 moduleShape(entry, [
                     [
@@ -360,7 +419,7 @@ function check(options, topology) {
                 ], 'apiRuntime');
                 moduleShape(contract, [
                     [
-                        'effect/unstable/rpc',
+                        'effect/rpc',
                         [
                             'Rpc',
                             'RpcGroup'
@@ -378,7 +437,7 @@ function check(options, topology) {
                     'Schema.Struct'
                 ]);
             } else if (exists(contract)) {
-                owner ??= options.baselinePackageDirectory ?? (0, external_microvertical_api_owner_cjs_namespaceObject.resolveBaselinePackageDirectory)(external_node_path_default().join(root, 'package.json'));
+                const owner = options.baselinePackageDirectory ?? (0, external_microvertical_api_owner_cjs_namespaceObject.resolveBaselinePackageDirectory)(absolute(contract));
                 const apiPrefix = app?.api?.prefix ?? `/${stem}-api`;
                 const basePath = `${apiPrefix}/${stem}`;
                 const expectation = {
@@ -395,21 +454,24 @@ function check(options, topology) {
                 const violation = (0, external_microvertical_api_baseline_cjs_namespaceObject.microVerticalApiBaselineViolation)(stem, absolute(contract), expectation);
                 if (violation) diagnostics.push(`${contract}: ${violation}`);
             }
-            moduleShape(client, [
-                [
-                    effect,
+            if (client) {
+                const relativeContract = external_node_path_default().posix.relative(external_node_path_default().posix.dirname(client), contract);
+                moduleShape(client, [
                     [
-                        'Effect',
-                        rpc ? 'makeEffectRpcClient' : 'makeEffectHttpApiClient'
+                        effect,
+                        [
+                            'Effect',
+                            rpc ? 'makeEffectRpcClient' : 'makeEffectHttpApiClient'
+                        ]
+                    ],
+                    [
+                        relativeContract.startsWith('.') ? relativeContract : `./${relativeContract}`,
+                        []
                     ]
-                ],
-                [
-                    rpc ? '../../shared/rpc.ts' : '../../shared/api',
-                    []
-                ]
-            ], [
-                rpc ? 'makeEffectRpcClient' : 'makeEffectHttpApiClient'
-            ], [], void 0, true);
+                ], [
+                    rpc ? 'makeEffectRpcClient' : 'makeEffectHttpApiClient'
+                ], [], void 0, appPath);
+            }
             moduleShape(`${appPath}/api/effect-api.ts`, [], [], [
                 [
                     /\bbackendFederationContract\b/u,
@@ -450,12 +512,26 @@ function check(options, topology) {
                     'must enable strictEffectApproach'
                 ]
             ]);
-            const packageFile = `${appPath}/package.json`;
-            if (exists(packageFile)) {
-                const manifest = JSON.parse(read(packageFile));
-                assert(manifest.exports?.['./api'] === `./shared/${rpc ? 'rpc' : 'api'}.ts`, `${packageFile}: invalid ./api export`);
-                assert(manifest.exports?.[`./api/${rpc ? 'rpc-client' : 'client'}`] === `./src/api/${stem}-${rpc ? 'rpc-client' : 'client'}.ts`, `${packageFile}: invalid API client export`);
-                assert(manifest.exports?.[`./api/${rpc ? 'client' : 'rpc-client'}`] === void 0, `${packageFile}: forbidden opposite protocol client export`);
+        });
+        const sourceRules = options.sourceRules ?? [];
+        const graph = (0, external_module_graph_cjs_namespaceObject.createModuleGraph)();
+        for (const file of sourceRules.length ? sourceFiles : [])if (/\.[cm]?[jt]sx?$/u.test(file)) guarded(file, ()=>{
+            let module;
+            try {
+                module = graph.module(absolute(file));
+            } catch (error) {
+                if (!(error instanceof external_source_analysis_cjs_namespaceObject.SourceSyntaxError)) throw error;
+                diagnostics.push(`${file}: source rules need parseable source (${error.message})`);
+                return;
+            }
+            for (const rule of sourceRules){
+                const messages = rule({
+                    file,
+                    module,
+                    graph
+                });
+                if (!Array.isArray(messages) || !messages.every((message)=>'string' == typeof message)) throw new Error(`rule ${rule.name || 'anonymous'} must return an array of violation messages (return [] when the file passes)`);
+                for (const message of messages)diagnostics.push(`${file}: ${message}`);
             }
         });
         const shell = 'apps/shell-super-app';
@@ -495,11 +571,13 @@ const checkMicroVerticalApiConsumerFiles = (options)=>check(options, false);
 exports.checkMicroVerticalApiBoundaries = __webpack_exports__.checkMicroVerticalApiBoundaries;
 exports.checkMicroVerticalApiConsumerFiles = __webpack_exports__.checkMicroVerticalApiConsumerFiles;
 exports.configuredMicroVerticalApiStem = __webpack_exports__.configuredMicroVerticalApiStem;
+exports.createModuleGraph = __webpack_exports__.createModuleGraph;
 exports.microVerticalApiBaselineViolation = __webpack_exports__.microVerticalApiBaselineViolation;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "checkMicroVerticalApiBoundaries",
     "checkMicroVerticalApiConsumerFiles",
     "configuredMicroVerticalApiStem",
+    "createModuleGraph",
     "microVerticalApiBaselineViolation"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/microvertical-api-owner.cjs

@@ -81,7 +81,7 @@ function importTarget(value) {
         if (resolved) return resolved;
     }
 }
-function baselinePublicIdentityIsExact(fromFile, expectation) {
+function baselinePublicIdentityIsExact(fromFile, expectation, reportMismatch) {
     const owner = external_node_fs_default().realpathSync(expectation.baselinePackageDirectory);
     const manifest = JSON.parse(external_node_fs_default().readFileSync(external_node_path_default().join(owner, 'package.json'), 'utf8'));
     if (expectation.baselinePackage !== baselinePackage || ![
@@ -95,7 +95,10 @@ function baselinePublicIdentityIsExact(fromFile, expectation) {
         if (error instanceof Error && error.message.includes('resolved to unrelated package')) return false;
         throw error;
     }
-    if (resolvedOwner !== owner) return false;
+    if (resolvedOwner !== owner) {
+        reportMismatch?.(`selected owner ${owner}; consumer resolves ${resolvedOwner}`);
+        return false;
+    }
     const target = importTarget(manifest.exports?.['./microvertical-api']);
     if (!target?.startsWith('./')) return false;
     const modules = new Map();