@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/cjs/ultramodern-workspace/fs-io.cjs

@@ -83,7 +83,8 @@ const workspaceOxfmtIgnorePatterns = [
     '.modern',
     '.modernjs',
     '**/modern-tanstack/**',
-    '**/routeTree.gen.*'
+    '**/routeTree.gen.*',
+    '**/src/routes/ultramodern-route-metadata.ts'
 ];
 const formattableExtensions = new Set([
     '.cjs',
@@ -158,7 +159,39 @@ function writeFileReplacing(targetDir, relativePath, content) {
 function writeJson(targetDir, relativePath, value) {
     writeFile(targetDir, relativePath, `${JSON.stringify(value, null, 2)}\n`);
 }
-function formatGeneratedSourceCandidates(sources) {
+function formatGeneratedSourceCandidates(sources, formattingWorkspaceRoot) {
+    if (formattingWorkspaceRoot) {
+        const oxfmtBin = resolveOxfmtBin();
+        return sources.map(([relativePath, source])=>{
+            assertSafeRelativePath(relativePath);
+            if (!formattableExtensions.has(external_node_path_default().extname(relativePath))) return source;
+            const result = (0, external_node_child_process_namespaceObject.spawnSync)(process.execPath, [
+                oxfmtBin,
+                '--stdin-filepath',
+                external_node_path_default().resolve(formattingWorkspaceRoot, relativePath)
+            ], {
+                cwd: formattingWorkspaceRoot,
+                input: source,
+                encoding: 'utf-8',
+                env: {
+                    ...process.env,
+                    FORCE_COLOR: '0'
+                }
+            });
+            if (0 !== result.status) {
+                const detail = [
+                    result.error?.message,
+                    result.stderr?.trim(),
+                    result.stdout?.trim()
+                ].filter(Boolean).join('\n');
+                throw new Error([
+                    'Failed to format generated UltraModern workspace output.',
+                    detail
+                ].filter(Boolean).join('\n'));
+            }
+            return result.stdout;
+        });
+    }
     const temporaryRoot = external_node_fs_default().mkdtempSync(external_node_path_default().join(external_node_os_default().tmpdir(), 'ultramodern-format-'));
     try {
         sources.forEach(([relativePath, source])=>writeFileReplacing(temporaryRoot, relativePath, source));
@@ -225,7 +258,9 @@ function writePreformatConfig(targetDir) {
         '  ignorePatterns: [',
         ...workspaceOxfmtIgnorePatterns.map((pattern)=>`    ${JSON.stringify(pattern)},`),
         '  ],',
+        '  printWidth: 120,',
         '  singleQuote: true,',
+        "  trailingComma: 'all',",
         '});',
         ''
     ].join('\n'), 'utf-8');

package/dist/cjs/ultramodern-workspace/generation-result.cjs

@@ -50,7 +50,7 @@ const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const rpc_cjs_namespaceObject = require("./api/rpc.cjs");
 const external_delivery_unit_cjs_namespaceObject = require("./delivery-unit.cjs");
-const up_projection_cjs_namespaceObject = require("./delivery-unit-schema/up-projection.cjs");
+const surfaces_cjs_namespaceObject = require("./delivery-unit-schema/surfaces.cjs");
 const external_descriptors_cjs_namespaceObject = require("./descriptors.cjs");
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
 const external_types_cjs_namespaceObject = require("./types.cjs");
@@ -124,15 +124,15 @@ function createGenerationResult(options) {
                 app.id,
                 app.apiPrefix
             ])),
-        generatedContractPath: external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH,
+        generatedContractPath: 'topology/reference-topology.json',
         warnings: options.warnings ?? [],
         deliveryUnits: options.createdApps.map((app)=>createGeneratedDeliveryUnitDescriptor(options.packageScope, app))
     };
 }
 function createGeneratedDeliveryUnitDescriptor(scope, app) {
     const record = (0, external_delivery_unit_cjs_namespaceObject.createDeliveryUnitRecord)(scope, app);
-    const surfaces = Object.entries(app.exposes ?? {}).map(([key, value])=>(0, up_projection_cjs_namespaceObject.exposeSurface)(app, key, value));
-    if ((0, external_descriptors_cjs_namespaceObject.appHasApi)(app)) surfaces.push((0, up_projection_cjs_namespaceObject.apiSurface)(app.api, (0, external_descriptors_cjs_namespaceObject.resolveApiProtocol)(app), 'rpc' === (0, external_descriptors_cjs_namespaceObject.resolveApiProtocol)(app) ? (0, rpc_cjs_namespaceObject.rpcPath)(app) : app.api.prefix));
+    const surfaces = Object.entries(app.exposes ?? {}).map(([key, value])=>(0, surfaces_cjs_namespaceObject.exposeSurface)(app, key, value));
+    if ((0, external_descriptors_cjs_namespaceObject.appHasApi)(app)) surfaces.push((0, surfaces_cjs_namespaceObject.apiSurface)(app.api, (0, external_descriptors_cjs_namespaceObject.resolveApiProtocol)(app), 'rpc' === (0, external_descriptors_cjs_namespaceObject.resolveApiProtocol)(app) ? (0, rpc_cjs_namespaceObject.rpcPath)(app) : app.api.prefix));
     const canonicalKind = 'shell' === app.kind ? 'shell' : app.deliveryUnitKind ?? 'microvertical';
     return {
         unitId: record.unitId,

package/dist/cjs/ultramodern-workspace/index.cjs

@@ -38,8 +38,7 @@ __webpack_require__.d(__webpack_exports__, {
     generateUltramodernWorkspace: ()=>external_write_workspace_cjs_namespaceObject.generateUltramodernWorkspace,
     normalizeUltramodernBridgeConfig: ()=>external_bridge_config_cjs_namespaceObject.normalizeUltramodernBridgeConfig,
     planUltramodernShell: ()=>external_add_shell_cjs_namespaceObject.planUltramodernShell,
-    planUltramodernVertical: ()=>external_add_vertical_cjs_namespaceObject.planUltramodernVertical,
-    resolveConfiguredAdditionalShells: ()=>external_shells_cjs_namespaceObject.resolveConfiguredAdditionalShells
+    planUltramodernVertical: ()=>external_add_vertical_cjs_namespaceObject.planUltramodernVertical
 });
 const external_add_shell_cjs_namespaceObject = require("./add-shell.cjs");
 const external_add_vertical_cjs_namespaceObject = require("./add-vertical.cjs");
@@ -59,7 +58,6 @@ exports.generateUltramodernWorkspace = __webpack_exports__.generateUltramodernWo
 exports.normalizeUltramodernBridgeConfig = __webpack_exports__.normalizeUltramodernBridgeConfig;
 exports.planUltramodernShell = __webpack_exports__.planUltramodernShell;
 exports.planUltramodernVertical = __webpack_exports__.planUltramodernVertical;
-exports.resolveConfiguredAdditionalShells = __webpack_exports__.resolveConfiguredAdditionalShells;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "BASELINE_DEPENDENCY_PINS",
     "OverlayBaselineRelaxationError",
@@ -71,8 +69,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "generateUltramodernWorkspace",
     "normalizeUltramodernBridgeConfig",
     "planUltramodernShell",
-    "planUltramodernVertical",
-    "resolveConfiguredAdditionalShells"
+    "planUltramodernVertical"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/ultramodern-workspace/mf-validation/constants.cjs

@@ -32,9 +32,6 @@ const mfTypesArchives = {
     cloudflare: 'dist-cloudflare/@mf-types.zip',
     node: 'dist/@mf-types.zip'
 };
-const generatedMetadataPaths = [
-    '.modernjs/ultramodern.json'
-];
 const defaultAppRootDirs = [
     'apps',
     'verticals'
@@ -50,19 +47,16 @@ const skippedScanDirs = new Set([
 ]);
 __webpack_require__.d(__webpack_exports__, {}, {
     defaultAppRootDirs: defaultAppRootDirs,
-    generatedMetadataPaths: generatedMetadataPaths,
     mfTypesArchives: mfTypesArchives,
     moduleFederationConfigFile: moduleFederationConfigFile,
     skippedScanDirs: skippedScanDirs
 });
 exports.defaultAppRootDirs = __webpack_exports__.defaultAppRootDirs;
-exports.generatedMetadataPaths = __webpack_exports__.generatedMetadataPaths;
 exports.mfTypesArchives = __webpack_exports__.mfTypesArchives;
 exports.moduleFederationConfigFile = __webpack_exports__.moduleFederationConfigFile;
 exports.skippedScanDirs = __webpack_exports__.skippedScanDirs;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "defaultAppRootDirs",
-    "generatedMetadataPaths",
     "mfTypesArchives",
     "moduleFederationConfigFile",
     "skippedScanDirs"

package/dist/cjs/ultramodern-workspace/mf-validation/discovery.cjs

@@ -48,14 +48,14 @@ const external_path_utils_cjs_namespaceObject = require("./path-utils.cjs");
 function discoverModuleFederationConfigs(options) {
     const workspaceRoot = external_node_path_default().resolve(options.workspaceRoot);
     const appDirs = new Set();
+    const metadata = (0, external_path_utils_cjs_namespaceObject.readJsonIfExists)(external_node_path_default().join(workspaceRoot, 'topology/reference-topology.json'));
+    const metadataAppDirs = new Set();
+    const apiOnlyDirs = (0, external_path_utils_cjs_namespaceObject.collectMetadataAppDirs)(metadata, metadataAppDirs);
     if (options.appDirs && options.appDirs.length > 0) for (const appDir of options.appDirs)appDirs.add((0, external_path_utils_cjs_namespaceObject.normalizeRelativePath)(appDir));
     else {
-        const metadata = (0, external_path_utils_cjs_namespaceObject.readGeneratedMetadata)(workspaceRoot);
         const scanRoots = new Set(external_constants_cjs_namespaceObject.defaultAppRootDirs);
-        for (const metadataEntry of metadata){
-            (0, external_path_utils_cjs_namespaceObject.collectMetadataAppDirs)(metadataEntry, appDirs);
-            (0, external_path_utils_cjs_namespaceObject.collectBridgeScanRoots)(metadataEntry, scanRoots);
-        }
+        for (const appDir of metadataAppDirs)appDirs.add(appDir);
+        (0, external_path_utils_cjs_namespaceObject.collectWorkspaceScanRoots)(workspaceRoot, scanRoots);
         for (const appDir of appDirs){
             const segment = (0, external_path_utils_cjs_namespaceObject.firstSegment)(appDir);
             if (segment) scanRoots.add(segment);
@@ -63,7 +63,7 @@ function discoverModuleFederationConfigs(options) {
         if (external_node_fs_default().existsSync(external_node_path_default().join(workspaceRoot, external_constants_cjs_namespaceObject.moduleFederationConfigFile))) appDirs.add('.');
         for (const scanRoot of scanRoots)(0, external_path_utils_cjs_namespaceObject.scanForModuleFederationConfigs)(workspaceRoot, scanRoot, appDirs);
     }
-    return Array.from(appDirs).sort().map((appDir)=>({
+    return Array.from(appDirs).sort().filter((appDir)=>!apiOnlyDirs.has(appDir) || external_node_fs_default().existsSync(external_node_path_default().join(workspaceRoot, appDir, external_constants_cjs_namespaceObject.moduleFederationConfigFile))).map((appDir)=>({
             appDir,
             configPath: external_node_path_default().join(workspaceRoot, appDir, external_constants_cjs_namespaceObject.moduleFederationConfigFile)
         }));

package/dist/cjs/{ultramodern-tooling/commands/migrate-strict-effect/generated-patches.cjs → ultramodern-workspace/mf-validation/exposes.cjs}

@@ -37,30 +37,26 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    ensureGeneratedPatchFile: ()=>ensureGeneratedPatchFile,
-    removeGeneratedPatchFileIfUnchanged: ()=>removeGeneratedPatchFileIfUnchanged
+    readModuleFederationExposePaths: ()=>readModuleFederationExposePaths
 });
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
-function ensureGeneratedPatchFile(io, relativePatchPath, sourcePatchPath) {
-    const targetPath = external_node_path_default().join(io.workspaceRoot, relativePatchPath);
-    const patch = external_node_fs_default().readFileSync(sourcePatchPath, 'utf-8');
-    return io.write(targetPath, patch);
+const external_constants_cjs_namespaceObject = require("./constants.cjs");
+const external_inspect_cjs_namespaceObject = require("./inspect.cjs");
+function readModuleFederationExposePaths(workspaceRoot, appDirectory) {
+    const configPath = external_node_path_default().join(workspaceRoot, appDirectory, external_constants_cjs_namespaceObject.moduleFederationConfigFile);
+    if (!external_node_fs_default().existsSync(configPath)) return;
+    try {
+        return (0, external_inspect_cjs_namespaceObject.inspectModuleFederationConfigSource)(external_node_fs_default().readFileSync(configPath, 'utf-8'), appDirectory, external_node_path_default().join(appDirectory, external_constants_cjs_namespaceObject.moduleFederationConfigFile)).exposePaths;
+    } catch  {
+        return;
+    }
 }
-function removeGeneratedPatchFileIfUnchanged(io, relativePatchPath, sourcePatchPath) {
-    const targetPath = external_node_path_default().join(io.workspaceRoot, relativePatchPath);
-    if (!external_node_fs_default().existsSync(targetPath)) return false;
-    const patch = external_node_fs_default().readFileSync(sourcePatchPath, 'utf-8');
-    if (external_node_fs_default().readFileSync(targetPath, 'utf-8') !== patch) return false;
-    return io.remove(targetPath);
-}
-exports.ensureGeneratedPatchFile = __webpack_exports__.ensureGeneratedPatchFile;
-exports.removeGeneratedPatchFileIfUnchanged = __webpack_exports__.removeGeneratedPatchFileIfUnchanged;
+exports.readModuleFederationExposePaths = __webpack_exports__.readModuleFederationExposePaths;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "ensureGeneratedPatchFile",
-    "removeGeneratedPatchFileIfUnchanged"
+    "readModuleFederationExposePaths"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/ultramodern-workspace/mf-validation/inspect.cjs

@@ -33,17 +33,35 @@ __webpack_require__.d(__webpack_exports__, {
 const external_object_literal_cjs_namespaceObject = require("./object-literal.cjs");
 const external_syntax_cjs_namespaceObject = require("./syntax.cjs");
 function extractExposes(configPath, value) {
-    if (void 0 === value) return [];
+    if (void 0 === value) return {
+        exposePaths: {},
+        exposes: []
+    };
     const object = (0, external_object_literal_cjs_namespaceObject.parseObjectLiteral)(value);
     if (object) {
         if (object.hasSpread) throw new Error(`Cannot statically extract Module Federation exposes from ${configPath}; use a literal exposes object without spreads.`);
-        return Array.from(object.properties.keys()).sort();
+        const exposePaths = {};
+        for (const [expose, source] of object.properties){
+            const exposePath = (0, external_object_literal_cjs_namespaceObject.parseLiteralString)(source);
+            if (void 0 !== exposePath) exposePaths[expose] = exposePath;
+        }
+        return {
+            exposePaths,
+            exposes: Array.from(object.properties.keys()).sort()
+        };
     }
     const array = (0, external_object_literal_cjs_namespaceObject.parseArrayLiteral)(value);
-    if (array) return array.sort();
+    if (array) return {
+        exposePaths: {},
+        exposes: array.sort()
+    };
     throw new Error(`Cannot statically extract Module Federation exposes from ${configPath}; use a literal exposes object or string array.`);
 }
-function extractDtsSettings(configPath, value) {
+function extractDtsSettings(configPath, value, exposes) {
+    if ('false' === value) {
+        if (exposes.length > 0) throw new Error(`Module Federation DTS cannot be disabled for exposed app ${configPath}.`);
+        return {};
+    }
     if (void 0 === value) return {};
     const dts = (0, external_object_literal_cjs_namespaceObject.parseObjectLiteral)(value);
     if (!dts || dts.hasSpread) throw new Error(`Cannot statically extract Module Federation DTS settings from ${configPath}; use a literal dts object.`);
@@ -56,7 +74,7 @@ function extractDtsSettings(configPath, value) {
     };
 }
 function hasHostOnlyNoExposesDeclaration(source) {
-    return /@?ultramodern-mf\s*:?\s*(?:host-only|no-exposes)\b/iu.test(source);
+    return ((0, external_syntax_cjs_namespaceObject.parseConfigModule)(source).comments ?? []).some((comment)=>/@?ultramodern-mf\s*:?\s*(?:host-only|no-exposes)\b/iu.test(comment.value));
 }
 function inspectModuleFederationConfigSource(source, appDir, configPath) {
     const configObject = (0, external_syntax_cjs_namespaceObject.findCreateModuleFederationConfigObject)(source) ?? (0, external_syntax_cjs_namespaceObject.findExportDefaultObject)(source);
@@ -64,13 +82,14 @@ function inspectModuleFederationConfigSource(source, appDir, configPath) {
     const properties = (0, external_object_literal_cjs_namespaceObject.parseObjectLiteral)(configObject);
     if (!properties) throw new Error(`Cannot statically inspect Module Federation config ${configPath}; expected a literal config object.`);
     if (properties.hasSpread) throw new Error(`Cannot statically inspect Module Federation config ${configPath}; top-level config spreads are not supported.`);
-    const exposes = extractExposes(configPath, properties.properties.get('exposes'));
+    const { exposePaths, exposes } = extractExposes(configPath, properties.properties.get('exposes'));
     const hostOnlyNoExposes = hasHostOnlyNoExposesDeclaration(source);
     if (hostOnlyNoExposes && exposes.length > 0) throw new Error(`Module Federation host-only/no-exposes declaration conflicts with actual exposes in ${configPath}.`);
     return {
         appDir,
         configPath,
-        dts: extractDtsSettings(configPath, properties.properties.get('dts')),
+        dts: extractDtsSettings(configPath, properties.properties.get('dts'), exposes),
+        exposePaths,
         exposes,
         hostOnlyNoExposes
     };

package/dist/cjs/ultramodern-workspace/mf-validation/object-literal.cjs

@@ -33,129 +33,29 @@ __webpack_require__.d(__webpack_exports__, {
     parseObjectLiteral: ()=>parseObjectLiteral
 });
 const external_syntax_cjs_namespaceObject = require("./syntax.cjs");
-function splitTopLevelEntries(source) {
-    const entries = [];
-    let start = 0;
-    let braceDepth = 0;
-    let bracketDepth = 0;
-    let parenDepth = 0;
-    for(let index = 0; index < source.length; index += 1){
-        const skipped = (0, external_syntax_cjs_namespaceObject.skipSyntax)(source, index);
-        if (skipped !== index) {
-            index = skipped - 1;
-            continue;
-        }
-        const char = source[index];
-        if ('{' === char) braceDepth += 1;
-        else if ('}' === char) braceDepth -= 1;
-        else if ('[' === char) bracketDepth += 1;
-        else if (']' === char) bracketDepth -= 1;
-        else if ('(' === char) parenDepth += 1;
-        else if (')' === char) parenDepth -= 1;
-        else if (',' === char && 0 === braceDepth && 0 === bracketDepth && 0 === parenDepth) {
-            const entry = source.slice(start, index).trim();
-            if (entry) entries.push(entry);
-            start = index + 1;
-        }
-    }
-    const finalEntry = source.slice(start).trim();
-    if (finalEntry) entries.push(finalEntry);
-    return entries;
-}
-function findTopLevelColon(source) {
-    let braceDepth = 0;
-    let bracketDepth = 0;
-    let parenDepth = 0;
-    for(let index = 0; index < source.length; index += 1){
-        const skipped = (0, external_syntax_cjs_namespaceObject.skipSyntax)(source, index);
-        if (skipped !== index) {
-            index = skipped - 1;
-            continue;
-        }
-        const char = source[index];
-        if ('{' === char) braceDepth += 1;
-        else if ('}' === char) braceDepth -= 1;
-        else if ('[' === char) bracketDepth += 1;
-        else if (']' === char) bracketDepth -= 1;
-        else if ('(' === char) parenDepth += 1;
-        else if (')' === char) parenDepth -= 1;
-        else if (':' === char && 0 === braceDepth && 0 === bracketDepth && 0 === parenDepth) return index;
-    }
-    return -1;
-}
-function stripConstAssertion(source) {
-    return source.trim().replace(/\s+as\s+const\s*$/u, '').trim();
-}
-function unescapeSingleQuotedString(value) {
-    return value.replace(/\\(['"\\nrtbfv0])/gu, (_, sequence)=>{
-        switch(sequence){
-            case 'n':
-                return '\n';
-            case 'r':
-                return '\r';
-            case 't':
-                return '\t';
-            case 'b':
-                return '\b';
-            case 'f':
-                return '\f';
-            case 'v':
-                return '\v';
-            case '0':
-                return '\0';
-            default:
-                return sequence;
-        }
-    });
-}
 function parseLiteralString(source) {
-    if (void 0 === source) return;
-    const trimmed = stripConstAssertion(source);
-    const quote = trimmed[0];
-    if ("'" !== quote && '"' !== quote && '`' !== quote) return;
-    if ('`' === quote) {
-        if (trimmed.includes('${')) return;
-        const close = trimmed.lastIndexOf('`');
-        return close > 0 ? trimmed.slice(1, close).replaceAll('\\`', '`') : void 0;
-    }
-    const close = trimmed.lastIndexOf(quote);
-    if (close <= 0 || '' !== trimmed.slice(close + 1).trim()) return;
-    const content = trimmed.slice(1, close);
-    if ('"' === quote) try {
-        return JSON.parse(trimmed);
-    } catch  {
-        return;
-    }
-    return unescapeSingleQuotedString(content);
-}
-function parseObjectKey(source) {
-    const trimmed = source.trim();
-    const literal = parseLiteralString(trimmed);
-    if (void 0 !== literal) return literal;
-    return /^[$A-Z_a-z][$\w]*$/u.test(trimmed) ? trimmed : void 0;
+    const node = (0, external_syntax_cjs_namespaceObject.parseStaticExpression)(source);
+    if (node?.type === 'StringLiteral') return node.value;
+    if (node?.type === 'TemplateLiteral' && 0 === node.expressions.length) return node.quasis[0]?.value.cooked ?? void 0;
 }
 function parseObjectLiteral(source) {
-    if (void 0 === source) return;
-    const block = (0, external_syntax_cjs_namespaceObject.getOuterBlock)(source, '{', '}');
-    if (!block) return;
+    const node = (0, external_syntax_cjs_namespaceObject.parseStaticExpression)(source);
+    if (void 0 === source || node?.type !== 'ObjectExpression') return;
     const properties = new Map();
     let hasSpread = false;
-    for (const entry of splitTopLevelEntries(block.inner)){
-        if (entry.startsWith('...')) {
-            hasSpread = true;
-            continue;
-        }
-        const colon = findTopLevelColon(entry);
-        if (-1 === colon) {
+    for (const property of node.properties){
+        if ('ObjectProperty' !== property.type || property.computed || property.shorthand) {
             hasSpread = true;
             continue;
         }
-        const key = parseObjectKey(entry.slice(0, colon));
-        if (void 0 === key) {
+        const key = 'Identifier' === property.key.type ? property.key.name : 'StringLiteral' === property.key.type ? property.key.value : void 0;
+        const value = (0, external_syntax_cjs_namespaceObject.parseStaticExpression)(source.slice(property.value.start ?? 0, property.value.end ?? 0));
+        if (void 0 === key || properties.has(key) || !value || null == value.start || null == value.end) {
             hasSpread = true;
             continue;
         }
-        properties.set(key, entry.slice(colon + 1).trim());
+        const rawValue = source.slice(property.value.start ?? 0, property.value.end ?? 0);
+        properties.set(key, rawValue.slice(value.start, value.end));
     }
     return {
         hasSpread,
@@ -163,17 +63,16 @@ function parseObjectLiteral(source) {
     };
 }
 function parseArrayLiteral(source) {
-    if (void 0 === source) return;
-    const block = (0, external_syntax_cjs_namespaceObject.getOuterBlock)(source, '[', ']');
-    if (!block) return;
-    const entries = splitTopLevelEntries(block.inner);
-    const exposes = [];
-    for (const entry of entries){
-        const expose = parseLiteralString(entry);
-        if (void 0 === expose) return;
-        exposes.push(expose);
+    const node = (0, external_syntax_cjs_namespaceObject.parseStaticExpression)(source);
+    if (void 0 === source || node?.type !== 'ArrayExpression') return;
+    const values = [];
+    for (const element of node.elements){
+        if (!element || 'SpreadElement' === element.type) return;
+        const value = parseLiteralString(source.slice(element.start ?? 0, element.end ?? 0));
+        if (void 0 === value) return;
+        values.push(value);
     }
-    return exposes;
+    return values;
 }
 exports.parseArrayLiteral = __webpack_exports__.parseArrayLiteral;
 exports.parseLiteralString = __webpack_exports__.parseLiteralString;

package/dist/cjs/ultramodern-workspace/mf-validation/path-utils.cjs

@@ -37,12 +37,11 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    collectBridgeScanRoots: ()=>collectBridgeScanRoots,
     collectMetadataAppDirs: ()=>collectMetadataAppDirs,
+    collectWorkspaceScanRoots: ()=>collectWorkspaceScanRoots,
     firstSegment: ()=>firstSegment,
     isRecord: ()=>isRecord,
     normalizeRelativePath: ()=>normalizeRelativePath,
-    readGeneratedMetadata: ()=>readGeneratedMetadata,
     readJsonIfExists: ()=>readJsonIfExists,
     relativePath: ()=>relativePath,
     scanForModuleFederationConfigs: ()=>scanForModuleFederationConfigs,
@@ -52,6 +51,7 @@ const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const utils_namespaceObject = require("@modern-js/utils");
 const external_constants_cjs_namespaceObject = require("./constants.cjs");
 function isRecord(value) {
     return null !== value && 'object' == typeof value && !Array.isArray(value);
@@ -71,20 +71,31 @@ function readJsonIfExists(filePath) {
     if (!external_node_fs_default().existsSync(filePath)) return;
     return JSON.parse(external_node_fs_default().readFileSync(filePath, 'utf-8'));
 }
-function addMetadataAppDir(value, appDirs, hint = '') {
-    if (!isRecord(value)) return;
-    const pathValue = 'string' == typeof value.path ? value.path : 'string' == typeof value.directory ? value.directory : void 0;
-    const hasModuleFederationDeclaration = isRecord(value.moduleFederation) || 'string' == typeof value.moduleFederationName || 'apps' === hint || 'verticals' === hint || 'remotes' === hint || 'moduleFederation' === hint;
-    if (pathValue && hasModuleFederationDeclaration && !external_node_path_default().isAbsolute(pathValue)) appDirs.add(normalizeRelativePath(pathValue));
-}
-function collectMetadataAppDirs(value, appDirs, hint = '') {
-    if (Array.isArray(value)) {
-        for (const entry of value)collectMetadataAppDirs(entry, appDirs, hint);
-        return;
+function collectMetadataAppDirs(value, appDirs) {
+    const apiOnlyDirs = new Set();
+    if (!isRecord(value)) return apiOnlyDirs;
+    const entries = [
+        {
+            app: value.shell,
+            vertical: false
+        },
+        ...Array.isArray(value.verticals) ? value.verticals.map((app)=>({
+                app,
+                vertical: true
+            })) : [],
+        ...Array.isArray(value.shells) ? value.shells.map((app)=>({
+                app,
+                vertical: false
+            })) : []
+    ];
+    for (const { app: entry, vertical } of entries){
+        if (!isRecord(entry) || 'string' != typeof entry.path || external_node_path_default().isAbsolute(entry.path)) throw new Error('Reference topology apps require relative paths.');
+        const normalized = normalizeRelativePath(entry.path);
+        if ('..' === normalized || normalized.startsWith('../')) throw new Error(`Topology app path leaves workspace: ${entry.path}`);
+        if (vertical && 'api-only' === entry.surfaceProfile) apiOnlyDirs.add(normalized);
+        else appDirs.add(normalized);
     }
-    if (!isRecord(value)) return;
-    addMetadataAppDir(value, appDirs, hint);
-    for (const [key, entry] of Object.entries(value))collectMetadataAppDirs(entry, appDirs, key);
+    return apiOnlyDirs;
 }
 function literalRootFromPattern(pattern) {
     const normalized = normalizeRelativePath(pattern);
@@ -97,26 +108,16 @@ function literalRootFromPattern(pattern) {
     }
     return literalSegments.length > 0 ? literalSegments.join('/') : void 0;
 }
-function collectBridgeScanRoots(value, roots) {
-    if (Array.isArray(value)) {
-        for (const entry of value)collectBridgeScanRoots(entry, roots);
-        return;
+function collectWorkspaceScanRoots(workspaceRoot, roots) {
+    const file = external_node_path_default().join(workspaceRoot, 'pnpm-workspace.yaml');
+    if (!external_node_fs_default().existsSync(file)) return;
+    const workspace = utils_namespaceObject.yaml.load(external_node_fs_default().readFileSync(file, 'utf8'));
+    if (!isRecord(workspace) || !Array.isArray(workspace.packages)) return;
+    for (const pattern of workspace.packages){
+        if ('string' != typeof pattern || pattern.startsWith('!')) continue;
+        const root = literalRootFromPattern(pattern);
+        if (root) roots.add(root);
     }
-    if (!isRecord(value)) return;
-    const workspacePackages = value.bridge;
-    if (isRecord(workspacePackages)) {
-        const entries = workspacePackages.workspacePackages;
-        if (Array.isArray(entries)) {
-            for (const entry of entries)if (isRecord(entry) && 'string' == typeof entry.pattern) {
-                const root = literalRootFromPattern(entry.pattern);
-                if (root) roots.add(root);
-            }
-        }
-    }
-    for (const entry of Object.values(value))collectBridgeScanRoots(entry, roots);
-}
-function readGeneratedMetadata(workspaceRoot) {
-    return external_constants_cjs_namespaceObject.generatedMetadataPaths.map((metadataPath)=>readJsonIfExists(external_node_path_default().join(workspaceRoot, metadataPath))).filter((metadata)=>void 0 !== metadata);
 }
 function firstSegment(appDir) {
     if ('.' === appDir) return;
@@ -138,23 +139,21 @@ function scanForModuleFederationConfigs(workspaceRoot, scanRoot, appDirs) {
     };
     visit(absoluteRoot);
 }
-exports.collectBridgeScanRoots = __webpack_exports__.collectBridgeScanRoots;
 exports.collectMetadataAppDirs = __webpack_exports__.collectMetadataAppDirs;
+exports.collectWorkspaceScanRoots = __webpack_exports__.collectWorkspaceScanRoots;
 exports.firstSegment = __webpack_exports__.firstSegment;
 exports.isRecord = __webpack_exports__.isRecord;
 exports.normalizeRelativePath = __webpack_exports__.normalizeRelativePath;
-exports.readGeneratedMetadata = __webpack_exports__.readGeneratedMetadata;
 exports.readJsonIfExists = __webpack_exports__.readJsonIfExists;
 exports.relativePath = __webpack_exports__.relativePath;
 exports.scanForModuleFederationConfigs = __webpack_exports__.scanForModuleFederationConfigs;
 exports.toPosixPath = __webpack_exports__.toPosixPath;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "collectBridgeScanRoots",
     "collectMetadataAppDirs",
+    "collectWorkspaceScanRoots",
     "firstSegment",
     "isRecord",
     "normalizeRelativePath",
-    "readGeneratedMetadata",
     "readJsonIfExists",
     "relativePath",
     "scanForModuleFederationConfigs",