@bleedingdev/modern-js-create 3.4.0-ultramodern.2 → 3.4.0-ultramodern.20

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

@@ -46,6 +46,7 @@ __webpack_require__.d(__webpack_exports__, {
     createPackageRoot: ()=>createPackageRoot,
     ensureInsideRoot: ()=>ensureInsideRoot,
     fileTemplatesDir: ()=>fileTemplatesDir,
+    formatGeneratedWorkspaceFiles: ()=>formatGeneratedWorkspaceFiles,
     hashFile: ()=>hashFile,
     hashTemplateTree: ()=>hashTemplateTree,
     readFileTemplate: ()=>readFileTemplate,
@@ -58,19 +59,53 @@ __webpack_require__.d(__webpack_exports__, {
     writeJson: ()=>writeJson,
     writeJsonFile: ()=>writeJsonFile
 });
+const external_node_child_process_namespaceObject = require("node:child_process");
 const external_node_crypto_namespaceObject = require("node:crypto");
 var external_node_crypto_default = /*#__PURE__*/ __webpack_require__.n(external_node_crypto_namespaceObject);
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
+const external_node_module_namespaceObject = require("node:module");
 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_create_package_root_cjs_namespaceObject = require("../create-package-root.cjs");
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
 const fs_io_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(__rslib_import_meta_url__));
+const fs_io_require = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__);
 const createPackageRoot = (0, external_create_package_root_cjs_namespaceObject.resolveCreatePackageRoot)(fs_io_dirname);
 const workspaceTemplateDir = external_node_path_default().join(createPackageRoot, 'template-workspace');
 const fileTemplatesDir = external_node_path_default().join(createPackageRoot, 'templates');
+const preformatConfigDir = '.modern-js';
+const preformatConfigPath = external_node_path_default().join(preformatConfigDir, 'ultramodern-preformat.oxfmt.config.mjs');
+const workspaceOxfmtIgnorePatterns = [
+    '.agents',
+    '.codex/skills',
+    '.output',
+    '**/*.json',
+    'dist',
+    'node_modules',
+    'repos/**',
+    '.modern',
+    '.modernjs',
+    '**/modern-tanstack/**',
+    '**/routeTree.gen.*'
+];
+const formattableExtensions = new Set([
+    '.cjs',
+    '.cts',
+    '.js',
+    '.json',
+    '.jsonc',
+    '.jsx',
+    '.mjs',
+    '.mts',
+    '.md',
+    '.mdx',
+    '.ts',
+    '.tsx',
+    '.yaml',
+    '.yml'
+]);
 function readFileTemplate(relativePath) {
     return external_node_fs_default().readFileSync(external_node_path_default().join(fileTemplatesDir, relativePath), 'utf-8');
 }
@@ -106,6 +141,86 @@ function writeFileReplacing(targetDir, relativePath, content) {
 function writeJson(targetDir, relativePath, value) {
     writeFile(targetDir, relativePath, `${JSON.stringify(value, null, 2)}\n`);
 }
+function formatGeneratedWorkspaceFiles(targetDir, relativePaths) {
+    const oxfmtBin = resolveOxfmtBin();
+    const oxfmtConfigPath = writePreformatConfig(targetDir);
+    const targets = void 0 === relativePaths ? [
+        targetDir,
+        `!${(0, external_naming_cjs_namespaceObject.normalizePath)(external_node_path_default().join(targetDir, 'repos'))}/**`
+    ] : relativePaths.filter((relativePath)=>formattableExtensions.has(external_node_path_default().extname(relativePath))).map((relativePath)=>external_node_path_default().join(targetDir, relativePath));
+    if (0 === targets.length) return void removePreformatConfig(targetDir);
+    try {
+        const result = (0, external_node_child_process_namespaceObject.spawnSync)(process.execPath, [
+            oxfmtBin,
+            '--config',
+            oxfmtConfigPath,
+            '--no-error-on-unmatched-pattern',
+            ...targets
+        ], {
+            cwd: targetDir,
+            encoding: 'utf-8',
+            env: {
+                ...process.env,
+                FORCE_COLOR: '0'
+            }
+        });
+        if (0 !== result.status) {
+            const detail = [
+                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'));
+        }
+    } finally{
+        removePreformatConfig(targetDir);
+    }
+}
+function writePreformatConfig(targetDir) {
+    const configPath = external_node_path_default().join(targetDir, preformatConfigPath);
+    external_node_fs_default().mkdirSync(external_node_path_default().dirname(configPath), {
+        recursive: true
+    });
+    const oxfmtUrl = (0, external_node_url_namespaceObject.pathToFileURL)(resolveOxfmtEntry()).href;
+    const ultraciteConfigUrl = (0, external_node_url_namespaceObject.pathToFileURL)(resolveUltraciteOxfmtConfig()).href;
+    external_node_fs_default().writeFileSync(configPath, [
+        `import { defineConfig } from ${JSON.stringify(oxfmtUrl)};`,
+        `import ultracite from ${JSON.stringify(ultraciteConfigUrl)};`,
+        '',
+        'export default defineConfig({',
+        '  extends: [ultracite],',
+        '  ignorePatterns: [',
+        ...workspaceOxfmtIgnorePatterns.map((pattern)=>`    ${JSON.stringify(pattern)},`),
+        '  ],',
+        '  singleQuote: true,',
+        '});',
+        ''
+    ].join('\n'), 'utf-8');
+    return configPath;
+}
+function removePreformatConfig(targetDir) {
+    external_node_fs_default().rmSync(external_node_path_default().join(targetDir, preformatConfigPath), {
+        force: true
+    });
+    try {
+        external_node_fs_default().rmdirSync(external_node_path_default().join(targetDir, preformatConfigDir));
+    } catch  {}
+}
+function resolveOxfmtBin() {
+    const packageJsonPath = fs_io_require.resolve('oxfmt/package.json');
+    const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, 'utf-8'));
+    const binPath = 'string' == typeof packageJson.bin ? packageJson.bin : packageJson.bin?.oxfmt;
+    if ('string' != typeof binPath || 0 === binPath.length) throw new Error('Unable to resolve oxfmt binary from package metadata.');
+    return external_node_path_default().join(external_node_path_default().dirname(packageJsonPath), binPath);
+}
+function resolveOxfmtEntry() {
+    return fs_io_require.resolve('oxfmt');
+}
+function resolveUltraciteOxfmtConfig() {
+    return fs_io_require.resolve('ultracite/oxfmt');
+}
 function renderTemplate(template, data) {
     return template.replace(/\{\{(\w+)\}\}/g, (match, key)=>data[key] ?? match);
 }
@@ -156,6 +271,7 @@ exports.copyRootTemplate = __webpack_exports__.copyRootTemplate;
 exports.createPackageRoot = __webpack_exports__.createPackageRoot;
 exports.ensureInsideRoot = __webpack_exports__.ensureInsideRoot;
 exports.fileTemplatesDir = __webpack_exports__.fileTemplatesDir;
+exports.formatGeneratedWorkspaceFiles = __webpack_exports__.formatGeneratedWorkspaceFiles;
 exports.hashFile = __webpack_exports__.hashFile;
 exports.hashTemplateTree = __webpack_exports__.hashTemplateTree;
 exports.readFileTemplate = __webpack_exports__.readFileTemplate;
@@ -174,6 +290,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createPackageRoot",
     "ensureInsideRoot",
     "fileTemplatesDir",
+    "formatGeneratedWorkspaceFiles",
     "hashFile",
     "hashTemplateTree",
     "readFileTemplate",

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

@@ -117,7 +117,7 @@ function createGenerationResult(options) {
                 app.id,
                 app.effectApiPrefix
             ])),
-        generatedContractPath: external_descriptors_cjs_namespaceObject.GENERATED_CONTRACT_PATH,
+        generatedContractPath: external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH,
         warnings: options.warnings ?? []
     };
 }

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

@@ -30,19 +30,23 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     addUltramodernVertical: ()=>external_add_vertical_cjs_namespaceObject.addUltramodernVertical,
     generateUltramodernWorkspace: ()=>external_write_workspace_cjs_namespaceObject.generateUltramodernWorkspace,
+    normalizeUltramodernBridgeConfig: ()=>external_bridge_config_cjs_namespaceObject.normalizeUltramodernBridgeConfig,
     planUltramodernVertical: ()=>external_add_vertical_cjs_namespaceObject.planUltramodernVertical,
     ultramodernWorkspaceVersions: ()=>external_versions_cjs_namespaceObject.ultramodernWorkspaceVersions
 });
 const external_add_vertical_cjs_namespaceObject = require("./add-vertical.cjs");
+const external_bridge_config_cjs_namespaceObject = require("./bridge-config.cjs");
 const external_versions_cjs_namespaceObject = require("./versions.cjs");
 const external_write_workspace_cjs_namespaceObject = require("./write-workspace.cjs");
 exports.addUltramodernVertical = __webpack_exports__.addUltramodernVertical;
 exports.generateUltramodernWorkspace = __webpack_exports__.generateUltramodernWorkspace;
+exports.normalizeUltramodernBridgeConfig = __webpack_exports__.normalizeUltramodernBridgeConfig;
 exports.planUltramodernVertical = __webpack_exports__.planUltramodernVertical;
 exports.ultramodernWorkspaceVersions = __webpack_exports__.ultramodernWorkspaceVersions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "addUltramodernVertical",
     "generateUltramodernWorkspace",
+    "normalizeUltramodernBridgeConfig",
     "planUltramodernVertical",
     "ultramodernWorkspaceVersions"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];