@bleedingdev/modern-js-create 3.5.0-ultramodern.11 → 3.5.0-ultramodern.12

package/dist/cjs/ultramodern-tooling/commands.cjs

@@ -407,6 +407,19 @@ function ensureYamlMapEntry(source, key, entryKey, value) {
         changed: true
     };
 }
+function removeYamlMapEntry(source, entryKey) {
+    const packageName = entryKey.includes('@') ? entryKey.slice(0, entryKey.lastIndexOf('@')) : entryKey;
+    const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const currentEntryPattern = new RegExp(`^ {2}'${escapedPackageName}@[^']+': .+\\n?`, 'mu');
+    if (!currentEntryPattern.test(source)) return {
+        source,
+        changed: false
+    };
+    return {
+        source: source.replace(currentEntryPattern, ''),
+        changed: true
+    };
+}
 function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchPath) {
     const targetPath = external_node_path_default().join(workspaceRoot, relativePatchPath);
     const patch = external_node_fs_default().readFileSync(sourcePatchPath, 'utf-8');
@@ -417,10 +430,53 @@ function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchP
     external_node_fs_default().writeFileSync(targetPath, patch, 'utf-8');
     return true;
 }
-function ensureGeneratedDeclarationPatches(workspaceRoot) {
+function removeGeneratedPatchFileIfUnchanged(workspaceRoot, relativePatchPath, sourcePatchPath) {
+    const targetPath = external_node_path_default().join(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;
+    external_node_fs_default().rmSync(targetPath);
+    return true;
+}
+function workspaceUsesDependency(workspaceRoot, packageName) {
+    const packageJsonPaths = [
+        external_node_path_default().join(workspaceRoot, 'package.json')
+    ];
+    for (const workspaceDir of [
+        'apps',
+        'verticals',
+        'packages'
+    ]){
+        const absoluteWorkspaceDir = external_node_path_default().join(workspaceRoot, workspaceDir);
+        if (external_node_fs_default().existsSync(absoluteWorkspaceDir)) for (const entry of external_node_fs_default().readdirSync(absoluteWorkspaceDir, {
+            withFileTypes: true
+        })){
+            if (!entry.isDirectory()) continue;
+            const packageJsonPath = external_node_path_default().join(absoluteWorkspaceDir, entry.name, 'package.json');
+            if (external_node_fs_default().existsSync(packageJsonPath)) packageJsonPaths.push(packageJsonPath);
+        }
+    }
+    for (const packageJsonPath of packageJsonPaths){
+        const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, 'utf-8'));
+        for (const field of [
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies'
+        ]){
+            const dependencies = packageJson[field];
+            if (dependencies && 'object' == typeof dependencies) {
+                if (Object.prototype.hasOwnProperty.call(dependencies, packageName)) return true;
+                for (const specifier of Object.values(dependencies))if ('string' == typeof specifier && specifier.startsWith(`npm:${packageName}@`)) return true;
+            }
+        }
+    }
+    return false;
+}
+function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
-    changed = ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
 }
 function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
@@ -428,6 +484,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     if (!external_node_fs_default().existsSync(workspaceFile)) return false;
     let source = external_node_fs_default().readFileSync(workspaceFile, 'utf-8');
     let changed = false;
+    const usesDrizzleOrm = workspaceUsesDependency(workspaceRoot, 'drizzle-orm');
     const replacements = [
         [
             /^ {4}'@effect\/vitest>effect': .+$/mu,
@@ -465,7 +522,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
-    const drizzleOrmPatch = ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath);
+    const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`);
     source = drizzleOrmPatch.source;
     changed = drizzleOrmPatch.changed || changed;
     if (changed) external_node_fs_default().writeFileSync(workspaceFile, source, 'utf-8');
@@ -633,7 +690,9 @@ and pnpm contract:check.
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
     updateGeneratedPnpmWorkspacePolicy(context.workspaceRoot);
-    ensureGeneratedDeclarationPatches(context.workspaceRoot);
+    ensureGeneratedDeclarationPatches(context.workspaceRoot, {
+        includeDrizzleOrmPatch: workspaceUsesDependency(context.workspaceRoot, 'drizzle-orm')
+    });
     if (!hasFlag(args, '--skip-install')) {
         const status = runPnpmLockfileRefresh(context);
         if (0 !== status) return status;

package/dist/esm/ultramodern-tooling/commands.js

@@ -360,6 +360,19 @@ function ensureYamlMapEntry(source, key, entryKey, value) {
         changed: true
     };
 }
+function removeYamlMapEntry(source, entryKey) {
+    const packageName = entryKey.includes('@') ? entryKey.slice(0, entryKey.lastIndexOf('@')) : entryKey;
+    const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const currentEntryPattern = new RegExp(`^ {2}'${escapedPackageName}@[^']+': .+\\n?`, 'mu');
+    if (!currentEntryPattern.test(source)) return {
+        source,
+        changed: false
+    };
+    return {
+        source: source.replace(currentEntryPattern, ''),
+        changed: true
+    };
+}
 function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchPath) {
     const targetPath = node_path.join(workspaceRoot, relativePatchPath);
     const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
@@ -370,10 +383,53 @@ function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchP
     node_fs.writeFileSync(targetPath, patch, 'utf-8');
     return true;
 }
-function ensureGeneratedDeclarationPatches(workspaceRoot) {
+function removeGeneratedPatchFileIfUnchanged(workspaceRoot, relativePatchPath, sourcePatchPath) {
+    const targetPath = node_path.join(workspaceRoot, relativePatchPath);
+    if (!node_fs.existsSync(targetPath)) return false;
+    const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
+    if (node_fs.readFileSync(targetPath, 'utf-8') !== patch) return false;
+    node_fs.rmSync(targetPath);
+    return true;
+}
+function workspaceUsesDependency(workspaceRoot, packageName) {
+    const packageJsonPaths = [
+        node_path.join(workspaceRoot, 'package.json')
+    ];
+    for (const workspaceDir of [
+        'apps',
+        'verticals',
+        'packages'
+    ]){
+        const absoluteWorkspaceDir = node_path.join(workspaceRoot, workspaceDir);
+        if (node_fs.existsSync(absoluteWorkspaceDir)) for (const entry of node_fs.readdirSync(absoluteWorkspaceDir, {
+            withFileTypes: true
+        })){
+            if (!entry.isDirectory()) continue;
+            const packageJsonPath = node_path.join(absoluteWorkspaceDir, entry.name, 'package.json');
+            if (node_fs.existsSync(packageJsonPath)) packageJsonPaths.push(packageJsonPath);
+        }
+    }
+    for (const packageJsonPath of packageJsonPaths){
+        const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf-8'));
+        for (const field of [
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies'
+        ]){
+            const dependencies = packageJson[field];
+            if (dependencies && 'object' == typeof dependencies) {
+                if (Object.prototype.hasOwnProperty.call(dependencies, packageName)) return true;
+                for (const specifier of Object.values(dependencies))if ('string' == typeof specifier && specifier.startsWith(`npm:${packageName}@`)) return true;
+            }
+        }
+    }
+    return false;
+}
+function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
-    changed = ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
 }
 function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
@@ -381,6 +437,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     if (!node_fs.existsSync(workspaceFile)) return false;
     let source = node_fs.readFileSync(workspaceFile, 'utf-8');
     let changed = false;
+    const usesDrizzleOrm = workspaceUsesDependency(workspaceRoot, 'drizzle-orm');
     const replacements = [
         [
             /^ {4}'@effect\/vitest>effect': .+$/mu,
@@ -418,7 +475,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
-    const drizzleOrmPatch = ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath);
+    const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${DRIZZLE_ORM_VERSION}`);
     source = drizzleOrmPatch.source;
     changed = drizzleOrmPatch.changed || changed;
     if (changed) node_fs.writeFileSync(workspaceFile, source, 'utf-8');
@@ -586,7 +643,9 @@ and pnpm contract:check.
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
     updateGeneratedPnpmWorkspacePolicy(context.workspaceRoot);
-    ensureGeneratedDeclarationPatches(context.workspaceRoot);
+    ensureGeneratedDeclarationPatches(context.workspaceRoot, {
+        includeDrizzleOrmPatch: workspaceUsesDependency(context.workspaceRoot, 'drizzle-orm')
+    });
     if (!hasFlag(args, '--skip-install')) {
         const status = runPnpmLockfileRefresh(context);
         if (0 !== status) return status;

package/dist/esm-node/ultramodern-tooling/commands.js

@@ -361,6 +361,19 @@ function ensureYamlMapEntry(source, key, entryKey, value) {
         changed: true
     };
 }
+function removeYamlMapEntry(source, entryKey) {
+    const packageName = entryKey.includes('@') ? entryKey.slice(0, entryKey.lastIndexOf('@')) : entryKey;
+    const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const currentEntryPattern = new RegExp(`^ {2}'${escapedPackageName}@[^']+': .+\\n?`, 'mu');
+    if (!currentEntryPattern.test(source)) return {
+        source,
+        changed: false
+    };
+    return {
+        source: source.replace(currentEntryPattern, ''),
+        changed: true
+    };
+}
 function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchPath) {
     const targetPath = node_path.join(workspaceRoot, relativePatchPath);
     const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
@@ -371,10 +384,53 @@ function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchP
     node_fs.writeFileSync(targetPath, patch, 'utf-8');
     return true;
 }
-function ensureGeneratedDeclarationPatches(workspaceRoot) {
+function removeGeneratedPatchFileIfUnchanged(workspaceRoot, relativePatchPath, sourcePatchPath) {
+    const targetPath = node_path.join(workspaceRoot, relativePatchPath);
+    if (!node_fs.existsSync(targetPath)) return false;
+    const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
+    if (node_fs.readFileSync(targetPath, 'utf-8') !== patch) return false;
+    node_fs.rmSync(targetPath);
+    return true;
+}
+function workspaceUsesDependency(workspaceRoot, packageName) {
+    const packageJsonPaths = [
+        node_path.join(workspaceRoot, 'package.json')
+    ];
+    for (const workspaceDir of [
+        'apps',
+        'verticals',
+        'packages'
+    ]){
+        const absoluteWorkspaceDir = node_path.join(workspaceRoot, workspaceDir);
+        if (node_fs.existsSync(absoluteWorkspaceDir)) for (const entry of node_fs.readdirSync(absoluteWorkspaceDir, {
+            withFileTypes: true
+        })){
+            if (!entry.isDirectory()) continue;
+            const packageJsonPath = node_path.join(absoluteWorkspaceDir, entry.name, 'package.json');
+            if (node_fs.existsSync(packageJsonPath)) packageJsonPaths.push(packageJsonPath);
+        }
+    }
+    for (const packageJsonPath of packageJsonPaths){
+        const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf-8'));
+        for (const field of [
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies'
+        ]){
+            const dependencies = packageJson[field];
+            if (dependencies && 'object' == typeof dependencies) {
+                if (Object.prototype.hasOwnProperty.call(dependencies, packageName)) return true;
+                for (const specifier of Object.values(dependencies))if ('string' == typeof specifier && specifier.startsWith(`npm:${packageName}@`)) return true;
+            }
+        }
+    }
+    return false;
+}
+function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
-    changed = ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
 }
 function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
@@ -382,6 +438,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     if (!node_fs.existsSync(workspaceFile)) return false;
     let source = node_fs.readFileSync(workspaceFile, 'utf-8');
     let changed = false;
+    const usesDrizzleOrm = workspaceUsesDependency(workspaceRoot, 'drizzle-orm');
     const replacements = [
         [
             /^ {4}'@effect\/vitest>effect': .+$/mu,
@@ -419,7 +476,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
-    const drizzleOrmPatch = ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath);
+    const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${DRIZZLE_ORM_VERSION}`);
     source = drizzleOrmPatch.source;
     changed = drizzleOrmPatch.changed || changed;
     if (changed) node_fs.writeFileSync(workspaceFile, source, 'utf-8');
@@ -587,7 +644,9 @@ and pnpm contract:check.
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
     updateGeneratedPnpmWorkspacePolicy(context.workspaceRoot);
-    ensureGeneratedDeclarationPatches(context.workspaceRoot);
+    ensureGeneratedDeclarationPatches(context.workspaceRoot, {
+        includeDrizzleOrmPatch: workspaceUsesDependency(context.workspaceRoot, 'drizzle-orm')
+    });
     if (!hasFlag(args, '--skip-install')) {
         const status = runPnpmLockfileRefresh(context);
         if (0 !== status) return status;

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.5.0-ultramodern.11",
+  "version": "3.5.0-ultramodern.12",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/esm-node/index.js",
   "bin": {
@@ -77,7 +77,7 @@
     "@modern-js/codesmith": "2.6.9",
     "oxfmt": "0.56.0",
     "ultracite": "7.8.3",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.11"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.12"
   },
   "devDependencies": {
     "@rslib/core": "0.23.1",
@@ -99,6 +99,6 @@
     "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
   },
   "ultramodern": {
-    "frameworkVersion": "3.5.0-ultramodern.11"
+    "frameworkVersion": "3.5.0-ultramodern.12"
   }
 }

package/template-workspace/pnpm-workspace.yaml.handlebars

@@ -63,5 +63,4 @@ allowBuilds:
 
 patchedDependencies:
   '@tanstack/router-core@{{tanstackRouterCoreVersion}}': patches/@tanstack__router-core@{{tanstackRouterCoreVersion}}.patch
-  'drizzle-orm@{{drizzleOrmVersion}}': patches/drizzle-orm-ts7-strict-declarations.patch
   'effect@{{effectVersion}}': patches/effect-schema-error-type-id.patch