@wpmoo/odoo 0.8.65 → 0.8.67

package/dist/external-assets.js

@@ -1,4 +1,4 @@
-import { cp, mkdir, mkdtemp, rm, stat, writeFile } from 'node:fs/promises';
+import { cp, mkdir, mkdtemp, readdir, rm, stat, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { dirname, join, relative, resolve } from 'node:path';
 import { realGit } from './git.js';
@@ -12,6 +12,14 @@ async function pathExists(path) {
         return false;
     }
 }
+async function statIfExists(path) {
+    try {
+        return await stat(path);
+    }
+    catch {
+        return undefined;
+    }
+}
 function expandHome(path) {
     if (path === '~')
         return process.env.HOME ?? path;
@@ -61,6 +69,25 @@ function isExcluded(relativePath, excludes) {
     const normalized = relativePath.split('\\').join('/');
     return excludes.some((pattern) => normalized === pattern || normalized.startsWith(`${pattern}/`));
 }
+async function removeDestinationTypeConflicts(sourcePath, destinationPath, excludes) {
+    async function visit(source) {
+        const rel = relative(sourcePath, source);
+        if (rel && isExcluded(rel, excludes))
+            return;
+        const sourceStat = await stat(source);
+        const destination = rel ? join(destinationPath, rel) : destinationPath;
+        const destinationStat = await statIfExists(destination);
+        if (destinationStat && sourceStat.isDirectory() !== destinationStat.isDirectory()) {
+            await rm(destination, { recursive: true, force: true });
+        }
+        if (!sourceStat.isDirectory()) {
+            return;
+        }
+        const entries = await readdir(source);
+        await Promise.all(entries.map((entry) => visit(join(source, entry))));
+    }
+    await visit(sourcePath);
+}
 async function copyDirectory(options, checkedOut) {
     const selectedSourceSubdir = await selectSourceSubdir(options, checkedOut.root);
     const sourcePath = selectedSourceSubdir ? join(checkedOut.root, selectedSourceSubdir) : checkedOut.root;
@@ -72,6 +99,7 @@ async function copyDirectory(options, checkedOut) {
     }
     const excludes = [...defaultExcludes, ...(options.exclude ?? [])];
     await mkdir(destinationPath, { recursive: true });
+    await removeDestinationTypeConflicts(sourcePath, destinationPath, excludes);
     await cp(sourcePath, destinationPath, {
         recursive: true,
         force: true,

package/dist/templates.js

@@ -1,3 +1,7 @@
+import { packageName, packageVersion } from './version.js';
+function fallbackPackageSpec() {
+    return `${packageName()}@${packageVersion()}`;
+}
 export function defaultCommunityAddons(product) {
     return [product];
 }
@@ -218,7 +222,7 @@ exposes them through \`/mnt/wpmoo-addons\`.
 \`./moo\` routes day-to-day service and module workflows to local scripts in
 \`./scripts/\` (for example \`start\`, \`logs\`, \`update\`, \`test\`, \`snapshot\`).
 \`./moo status\` and \`./moo doctor\` are package fallback commands that run via
-\`npx --yes @wpmoo/odoo@latest ...\`.
+\`npx --yes ${fallbackPackageSpec()} ...\`.
 
 ### Start And Inspect Services
 
@@ -547,7 +551,7 @@ case "$command" in
     run_script ./scripts/pot.sh "$@"
     ;;
   *)
-    exec npx --yes @wpmoo/odoo@latest "$@"
+    exec npx --yes ${fallbackPackageSpec()} "$@"
     ;;
 esac
 `;
@@ -705,7 +709,7 @@ Useful maintenance commands:
 
 Daily script delegation vs package fallback:
 - \`./moo start\`, \`logs\`, \`install\`, \`update\`, \`test\`, \`snapshot\`, and related runtime tasks delegate to local \`./scripts/*.sh\`.
-- \`./moo status\` and \`./moo doctor\` are package fallback commands routed to \`npx --yes @wpmoo/odoo@latest ...\`.
+- \`./moo status\` and \`./moo doctor\` are package fallback commands routed to \`npx --yes ${fallbackPackageSpec()} ...\`.
 
 Only report completion after the relevant update/test/lint command exits cleanly.
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpmoo/odoo",
-  "version": "0.8.65",
+  "version": "0.8.67",
   "description": "WPMoo Odoo lifecycle tooling for development, staging, and production workflows.",
   "type": "module",
   "repository": {