@wpmoo/odoo 0.8.63 → 0.8.64

package/README.md

@@ -142,8 +142,8 @@ npx @wpmoo/odoo doctor
 npx @wpmoo/odoo doctor --fix
 npx @wpmoo/odoo add-repo --repo-url https://github.com/example-org/odoo_sample_module_reports.git
 npx @wpmoo/odoo remove-repo --repo odoo_sample_module_reports
-npx @wpmoo/odoo add-module --repo odoo_sample_module --module odoo_sample_module_base
-npx @wpmoo/odoo remove-module --repo odoo_sample_module --module odoo_sample_module_base
+npx @wpmoo/odoo add-module --repo odoo_sample_module --module odoo_sample_module_base --source-type private
+npx @wpmoo/odoo remove-module --repo odoo_sample_module --module odoo_sample_module_base --source-type private
 npx @wpmoo/odoo reset --dry-run
 npx @wpmoo/odoo reset
 
@@ -275,10 +275,13 @@ GitHub CLI is optional for repository setup. When it is available and authentica
 
 Add a minimal Odoo module skeleton to a source repository:
 
+For module actions, `--source-type` selects the source directory (`private`, `oca`, or `external`). Default is `private`.
+
 ```bash
 npx @wpmoo/odoo add-module \
   --repo odoo_sample_module \
-  --module odoo_sample_module_base
+  --module odoo_sample_module_base \
+  --source-type oca
 ```
 
 Remove a module registration while keeping files:
@@ -286,7 +289,8 @@ Remove a module registration while keeping files:
 ```bash
 npx @wpmoo/odoo remove-module \
   --repo odoo_sample_module \
-  --module odoo_sample_module_base
+  --module odoo_sample_module_base \
+  --source-type oca
 ```
 
 Delete module files as well:

package/dist/cli.js

@@ -399,21 +399,39 @@ async function ensureAddRepoGitHubRepository(options, cancelAction = 'exit') {
     await createGitHubRepository(realGitHub, options.repoUrl, visibility);
 }
 async function selectSourceRepo(target, cancelAction = 'exit') {
-    const repos = await listModuleRepos(target);
-    if (repos.length === 0) {
+    const repos = await listSources(target);
+    const repoOptions = repos.length > 0
+        ? repos.map((repo) => ({
+            value: { repoPath: repo.path, sourceType: repo.type },
+            label: `${repo.type}/${repo.path}`,
+        }))
+        : (await listModuleRepos(target)).map((repoPath) => ({
+            value: { repoPath, sourceType: 'private' },
+            label: `private/${repoPath}`,
+        }));
+    if (repoOptions.length === 0) {
         if (cancelAction === 'back') {
-            note(`No source repos found under ${target}/odoo/custom/src/private.\nNext: choose "Add source repo" first.`, 'Nothing to select');
+            note(`No source repos found under ${target}/odoo/custom/src.\nNext: choose "Add source repo" first.`, 'Nothing to select');
             handleUnavailableMenuChoice(cancelAction);
         }
-        throw new Error(`No source repos found under ${target}/odoo/custom/src/private`);
+        throw new Error(`No source repos found under ${target}/odoo/custom/src`);
     }
-    const repoPath = await select({
+    const selected = await select({
         message: menuPromptMessage('Source repo', cancelAction),
-        options: repos.map((repo) => ({ value: repo, label: repo })),
-        initialValue: repos[0],
+        options: repoOptions,
+        initialValue: repoOptions[0].value,
     });
-    handleCancel(repoPath, cancelAction);
-    return String(repoPath);
+    handleCancel(selected, cancelAction);
+    if (typeof selected === 'string') {
+        return { repoPath: selected, sourceType: 'private' };
+    }
+    if (typeof selected === 'object' && selected !== null && 'repoPath' in selected && 'sourceType' in selected) {
+        return { repoPath: selected.repoPath, sourceType: selected.sourceType };
+    }
+    return { repoPath: String(selected), sourceType: 'private' };
+}
+function formatSourceRepoPromptPath(target, selected) {
+    return renderedSourceRepoPath(target, selected.sourceType, selected.repoPath);
 }
 function suggestedModuleName(repoPath) {
     return 'odoo_sample_module';
@@ -430,6 +448,7 @@ async function addModuleOptionsFromArgs(argv) {
         target,
         repoPath,
         moduleName,
+        sourceType: optionalSourceTypeValue(values),
         odooVersion: await commandOdooVersion(target, stringOption(values, 'odooVersion')),
         stage: booleanOption(values, 'stage', true),
     };
@@ -437,15 +456,16 @@ async function addModuleOptionsFromArgs(argv) {
 async function addModuleOptionsFromPrompts(showIntro = true, cancelAction = 'exit') {
     showSubmenuIntro('Add module to source repo', showIntro, cancelAction);
     const target = process.cwd();
-    const repoPath = await selectSourceRepo(target, cancelAction);
+    const sourceRepo = await selectSourceRepo(target, cancelAction);
     const moduleName = asString(await text({
         message: menuPromptMessage('Module name', cancelAction),
-        placeholder: suggestedModuleName(repoPath),
+        placeholder: suggestedModuleName(sourceRepo.repoPath),
         validate: (value) => (value.trim() ? undefined : 'Enter the module technical name.'),
-    }), suggestedModuleName(repoPath), cancelAction);
+    }), suggestedModuleName(sourceRepo.repoPath), cancelAction);
     return {
         target,
-        repoPath,
+        repoPath: sourceRepo.repoPath,
+        sourceType: sourceRepo.sourceType,
         moduleName,
         odooVersion: await commandOdooVersion(target),
         stage: true,
@@ -587,6 +607,7 @@ function removeModuleOptionsFromArgs(argv) {
         target: resolve(stringOption(values, 'target') ?? process.cwd()),
         repoPath,
         moduleName,
+        sourceType: optionalSourceTypeValue(values),
         deleteFiles: booleanOption(values, 'deleteFiles', false),
         stage: booleanOption(values, 'stage', true),
     };
@@ -594,14 +615,14 @@ function removeModuleOptionsFromArgs(argv) {
 async function removeModuleOptionsFromPrompts(showIntro = true, cancelAction = 'exit') {
     showSubmenuIntro('Remove module from source repo', showIntro, cancelAction);
     const target = process.cwd();
-    const repoPath = await selectSourceRepo(target, cancelAction);
-    const modules = await listModulesInSourceRepo(target, repoPath);
+    const sourceRepo = await selectSourceRepo(target, cancelAction);
+    const modules = await listModulesInSourceRepo(target, sourceRepo.repoPath, sourceRepo.sourceType);
     if (modules.length === 0) {
         if (cancelAction === 'back') {
-            note(`No Odoo modules found under ${target}/odoo/custom/src/private/${repoPath}.\nNext: choose "Add module to source repo" first.`, 'Nothing to remove');
+            note(`No Odoo modules found under ${formatSourceRepoPromptPath(target, sourceRepo)}.\nNext: choose "Add module to source repo" first.`, 'Nothing to remove');
             handleUnavailableMenuChoice(cancelAction);
         }
-        throw new Error(`No Odoo modules found under ${target}/odoo/custom/src/private/${repoPath}`);
+        throw new Error(`No Odoo modules found under ${formatSourceRepoPromptPath(target, sourceRepo)}`);
     }
     const moduleName = await select({
         message: menuPromptMessage('Module to remove', cancelAction),
@@ -618,7 +639,8 @@ async function removeModuleOptionsFromPrompts(showIntro = true, cancelAction = '
     handleCancel(deleteFiles, cancelAction);
     return {
         target,
-        repoPath,
+        repoPath: sourceRepo.repoPath,
+        sourceType: sourceRepo.sourceType,
         moduleName: String(moduleName),
         deleteFiles: Boolean(deleteFiles),
         stage: true,

package/dist/cockpit/daily-prompts.js

@@ -1,6 +1,7 @@
 import { isCancel, select, text } from '@clack/prompts';
 import { listModulesInSourceRepo } from '../module-actions.js';
 import { listModuleRepos } from '../repo-actions.js';
+import { listSources } from '../source-actions.js';
 import { handlePromptCancel, menuPromptMessage, } from '../menu-navigation.js';
 const manualModuleValue = '__wpmoo_manual_module_entry__';
 function defaultCancelHandler(value, action) {
@@ -27,10 +28,13 @@ function requiredString(value, message, deps) {
 }
 async function detectedModules(cwd) {
     try {
-        const repos = await listModuleRepos(cwd);
+        const sources = await listSources(cwd);
+        const repos = sources.length > 0
+            ? sources.map((source) => ({ path: source.path, sourceType: source.type }))
+            : (await listModuleRepos(cwd)).map((path) => ({ path, sourceType: 'private' }));
         const modules = await Promise.all(repos.map(async (repo) => {
             try {
-                return await listModulesInSourceRepo(cwd, repo);
+                return await listModulesInSourceRepo(cwd, repo.path, repo.sourceType);
             }
             catch {
                 return [];

package/dist/help.js

@@ -13,8 +13,8 @@ Usage:
   npx @wpmoo/odoo source sync
   npx @wpmoo/odoo source add --repo-url <url> [--source-type private|oca|external]
   npx @wpmoo/odoo source remove --repo <name> [--source-type private|oca|external]
-  npx @wpmoo/odoo add-module --repo <source-repo> --module <module-name>
-  npx @wpmoo/odoo remove-module --repo <source-repo> --module <module-name>
+  npx @wpmoo/odoo add-module --repo <source-repo> --module <module-name> [--source-type <category>]
+  npx @wpmoo/odoo remove-module --repo <source-repo> --module <module-name> [--source-type <category>]
   npx @wpmoo/odoo reset [--dry-run]
   npx @wpmoo/odoo doctor [--fix]
   npx @wpmoo/odoo start
@@ -49,7 +49,7 @@ Options:
   --http-port <port>           Host HTTP port written to .env.example.
   --gevent-port <port>         Host gevent/live chat port written to .env.example.
   --repo-url <url>             Source repo URL for add-repo.
-  --source-type <category>     Source repo category for add-repo/remove-repo. One of private, oca, external. Default: private.
+  --source-type <category>     Source repo category for add-repo/remove-repo/add-module/remove-module. One of private, oca, external. Default: private.
   --repo <name>                Source repo folder name for repo/module actions.
   --module <name>              Odoo module technical name for module actions.
   --delete-files               Also delete module files in remove-module. Default: false.
@@ -101,7 +101,11 @@ Task recipes:
     npx @wpmoo/odoo source list
     npx @wpmoo/odoo source sync
   Add module:
-    npx @wpmoo/odoo add-module --repo <source-repo> --module <module-name>
+    npx @wpmoo/odoo add-module --repo <source-repo> --module <module-name> --source-type private|oca|external
+  Remove module:
+    npx @wpmoo/odoo remove-module --repo <source-repo> --module <module-name> --source-type private|oca|external
+  Add OCA module:
+    npx @wpmoo/odoo add-module --repo sale-workflow --module sale_order_line_no_discount --source-type oca
   Run tests:
     npx @wpmoo/odoo test <module[,module]> [--db <db>] [--mode init|update] [--tags <tags>]
   Safe reset and recover:

package/dist/module-actions.js

@@ -5,11 +5,15 @@ import { readEnvironmentMetadata } from './environment.js';
 import { realGit, stageAll } from './git.js';
 import { pathUnderBase, validateModuleName, validateRepoPath } from './path-validation.js';
 import { readAddonsYaml, writeAddonsYaml } from './repo-actions.js';
-function sourceRepoPath(target, repoPath) {
-    return pathUnderBase(join(target, 'odoo/custom/src/private'), repoPath, 'repo path');
+const validSourceTypes = ['private', 'oca', 'external'];
+function normalizeSourceType(value) {
+    return validSourceTypes.includes(value) ? value : 'private';
 }
-function modulePath(target, repoPath, moduleName) {
-    return pathUnderBase(sourceRepoPath(target, repoPath), moduleName, 'module name');
+function sourceRepoPath(target, sourceType, repoPath) {
+    return pathUnderBase(join(target, `odoo/custom/src/${sourceType}`), repoPath, 'repo path');
+}
+function modulePath(target, sourceType, repoPath, moduleName) {
+    return pathUnderBase(sourceRepoPath(target, sourceType, repoPath), moduleName, 'module name');
 }
 function titleizeModule(moduleName) {
     return moduleName
@@ -49,7 +53,8 @@ async function usesAddonsYaml(target) {
 export async function addModuleToSourceRepo(options, git = realGit) {
     const repoPath = validateRepoPath(options.repoPath);
     const moduleName = validateModuleName(options.moduleName);
-    const destination = modulePath(options.target, repoPath, moduleName);
+    const sourceType = normalizeSourceType(options.sourceType);
+    const destination = modulePath(options.target, sourceType, repoPath, moduleName);
     await mkdir(join(destination, 'models'), { recursive: true });
     await mkdir(join(destination, 'security'), { recursive: true });
     await mkdir(join(destination, 'views'), { recursive: true });
@@ -58,24 +63,25 @@ export async function addModuleToSourceRepo(options, git = realGit) {
     await writeIfMissing(join(destination, 'models/__init__.py'), '');
     await writeIfMissing(join(destination, 'security/ir.model.access.csv'), 'id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink\n');
     await writeIfMissing(join(destination, 'views/.gitkeep'), '');
-    if (await usesAddonsYaml(options.target)) {
+    if (sourceType === 'private' && (await usesAddonsYaml(options.target))) {
         const addonsYaml = await readAddonsYaml(options.target);
         await writeAddonsYaml(options.target, addModuleToSourceRepoInAddonsYaml(addonsYaml, repoPath, moduleName));
     }
     if (options.stage) {
-        await stageAll(git, sourceRepoPath(options.target, repoPath));
+        await stageAll(git, sourceRepoPath(options.target, sourceType, repoPath));
         await stageAll(git, options.target);
     }
 }
-export async function listModulesInSourceRepo(target, repoPath) {
+export async function listModulesInSourceRepo(target, repoPath, sourceType) {
     const safeRepoPath = validateRepoPath(repoPath);
+    const resolvedSourceType = normalizeSourceType(sourceType);
     try {
-        const entries = await readdir(sourceRepoPath(target, safeRepoPath), { withFileTypes: true });
+        const entries = await readdir(sourceRepoPath(target, resolvedSourceType, safeRepoPath), { withFileTypes: true });
         const modules = await Promise.all(entries
             .filter((entry) => entry.isDirectory())
             .map(async (entry) => {
             try {
-                await readFile(join(sourceRepoPath(target, safeRepoPath), entry.name, '__manifest__.py'), 'utf8');
+                await readFile(join(sourceRepoPath(target, resolvedSourceType, safeRepoPath), entry.name, '__manifest__.py'), 'utf8');
                 return entry.name;
             }
             catch {
@@ -91,16 +97,17 @@ export async function listModulesInSourceRepo(target, repoPath) {
 export async function removeModuleFromSourceRepo(options, git = realGit) {
     const repoPath = validateRepoPath(options.repoPath);
     const moduleName = validateModuleName(options.moduleName);
-    if (await usesAddonsYaml(options.target)) {
+    const sourceType = normalizeSourceType(options.sourceType);
+    if (sourceType === 'private' && (await usesAddonsYaml(options.target))) {
         const addonsYaml = await readAddonsYaml(options.target);
         await writeAddonsYaml(options.target, removeModuleFromSourceRepoInAddonsYaml(addonsYaml, repoPath, moduleName));
     }
     if (options.deleteFiles) {
-        await rm(modulePath(options.target, repoPath, moduleName), { recursive: true, force: true });
+        await rm(modulePath(options.target, sourceType, repoPath, moduleName), { recursive: true, force: true });
     }
     if (options.stage) {
         if (options.deleteFiles) {
-            await stageAll(git, sourceRepoPath(options.target, repoPath));
+            await stageAll(git, sourceRepoPath(options.target, sourceType, repoPath));
         }
         await stageAll(git, options.target);
     }

package/dist/status.js

@@ -3,6 +3,16 @@ import { join } from 'node:path';
 import { detectComposeLayout, readEnvFile, selectedComposeEnvironment } from './compose-layout.js';
 import { defaultOdooVersion, markerPath } from './environment.js';
 import { isValidPathSegment, validateRepoPath } from './path-validation.js';
+const validSourceTypes = ['private', 'oca', 'external'];
+function normalizeSourceType(sourceType) {
+    if (typeof sourceType === 'string' && validSourceTypes.includes(sourceType)) {
+        return sourceType;
+    }
+    return 'private';
+}
+function sourceRepoPath(target, sourceType, path) {
+    return join(target, 'odoo/custom/src', sourceType, path);
+}
 async function pathExists(path) {
     try {
         await access(path);
@@ -27,9 +37,11 @@ function parseMetadata(content) {
 }
 function sourceRepoPathsFromMetadata(metadata) {
     const sourceRepoPaths = [];
+    const sourceRepoLocations = [];
     const invalidSourceRepoPaths = [];
-    if (!Array.isArray(metadata.sourceRepos))
-        return { sourceRepoPaths, invalidSourceRepoPaths };
+    if (!Array.isArray(metadata.sourceRepos)) {
+        return { sourceRepoPaths, sourceRepoLocations, invalidSourceRepoPaths };
+    }
     for (const repo of metadata.sourceRepos) {
         const path = repo && typeof repo.path === 'string' ? repo.path.trim() : '';
         if (!path)
@@ -38,9 +50,12 @@ function sourceRepoPathsFromMetadata(metadata) {
             invalidSourceRepoPaths.push(path);
             continue;
         }
-        sourceRepoPaths.push(validateRepoPath(path));
+        const sourceType = normalizeSourceType(typeof repo.sourceType === 'string' ? repo.sourceType : undefined);
+        const normalizedPath = validateRepoPath(path);
+        sourceRepoPaths.push(normalizedPath);
+        sourceRepoLocations.push({ sourceType, path: normalizedPath });
     }
-    return { sourceRepoPaths, invalidSourceRepoPaths };
+    return { sourceRepoPaths, sourceRepoLocations, invalidSourceRepoPaths };
 }
 async function missingCoreFiles(target, odooVersion) {
     const missing = [];
@@ -135,8 +150,8 @@ export async function getEnvironmentStatus(target) {
     const odooVersion = typeof metadata.odooVersion === 'string' && metadata.odooVersion.trim()
         ? metadata.odooVersion.trim()
         : defaultOdooVersion;
-    const { sourceRepoPaths, invalidSourceRepoPaths } = sourceRepoPathsFromMetadata(metadata);
-    const repoRoots = sourceRepoPaths.map((path) => join(target, 'odoo/custom/src/private', path));
+    const { sourceRepoPaths, sourceRepoLocations, invalidSourceRepoPaths } = sourceRepoPathsFromMetadata(metadata);
+    const repoRoots = sourceRepoLocations.map(({ sourceType, path }) => sourceRepoPath(target, sourceType, path));
     let moduleCandidateCount = 0;
     for (const repoRoot of repoRoots) {
         moduleCandidateCount += await countModuleCandidatesInRepoPath(repoRoot);

package/package.json

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