@ossy/cli 0.14.1 → 0.16.0

package/README.md

@@ -9,6 +9,7 @@ Unified CLI for the Ossy platform: app dev/build and CMS workflows.
 | `init [dir]` | Scaffold a new Ossy app (default: current directory) |
 | `dev` | Start dev server with watch (uses `src/*.page.jsx` or `src/pages.jsx`, `src/config.js`) |
 | `build` | Production build |
+| `publish` | Queue a container deployment via `@ossy/deployment-tools` (see below) |
 | `cms upload` | Upload resource templates to your workspace |
 | `cms validate` | Validate ossy config and resource templates |
 
@@ -21,6 +22,26 @@ npx @ossy/cli build
 
 Options: `--pages`, `--config`, `--destination`. See `@ossy/app` for details.
 
+## Publish (container / website)
+
+Publishes a site by sending a deployment request to your platform queue (same as `npx @ossy/deployment-tools deployment deploy`). Run from the **website package** directory (where `src/config.js` lives) so domain/platform can be read automatically.
+
+```bash
+cd packages/my-website
+npx @ossy/cli publish \
+  --username <github-username> \
+  --authentication <token> \
+  --platforms-path ../infrastructure/platforms.json \
+  --deployments-path ../infrastructure/deployments.json
+```
+
+- **`--domain` / `--platform`** — Optional if `src/config.js` contains string literals `domain: '…'` and `platform: '…'` (or `targetDeploymentPlatform`).
+- **`--config`** — Path to another `config.js` if not `./src/config.js`.
+- If `platform` is omitted but `domain` is set (from flags or config), it is inferred from `deployments.json` when that domain appears under exactly one `targetDeploymentPlatform`.
+- **`--all`** — Runs `deployment deploy-all` for the platform; requires `--platform` or `platform` in config.
+
+Requires network access so `npx` can run `@ossy/deployment-tools`.
+
 ## CMS: upload
 
 Upload resource templates to your workspace so they can be used in the UI.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/cli",
-  "version": "0.14.1",
+  "version": "0.16.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ossy-se/packages.git"
@@ -17,8 +17,9 @@
   "license": "MIT",
   "bin": "./src/index.js",
   "dependencies": {
-    "@ossy/app": "^0.14.1",
-    "arg": "^5.0.2"
+    "@ossy/app": "^0.15.0",
+    "arg": "^5.0.2",
+    "glob": "^10.3.10"
   },
   "publishConfig": {
     "access": "public",
@@ -28,5 +29,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "b64b14021bc1f3aa6d8668a64754e0ba8b4ab63d"
+  "gitHead": "a575c008d0b4ebba15186143db5fc837bd6ac2d7"
 }

package/src/index.js

@@ -2,11 +2,12 @@
 import { build, dev } from '@ossy/app'
 import * as Cms from './cms/cli.js'
 import * as Init from './init/cli.js'
+import { publish } from './publish/cli.js'
 
 const [,, command, ...restArgs] = process.argv
 
 if (!command) {
-  console.error('[@ossy/cli] No command provided. Usage: ossy dev | build | init | cms <subcommand>')
+  console.error('[@ossy/cli] No command provided. Usage: ossy dev | build | publish | init | cms <subcommand>')
   process.exit(1)
 }
 
@@ -19,6 +20,10 @@ const run = async () => {
     Init.init(restArgs)
     return
   }
+  if (command === 'publish') {
+    await publish(restArgs)
+    return
+  }
   if (command === 'dev') {
     await dev(restArgs)
     return

package/src/publish/cli.js

@@ -0,0 +1,132 @@
+import { existsSync } from 'fs'
+import { resolve as pathResolve } from 'path'
+import { spawn } from 'child_process'
+import arg from 'arg'
+import { logInfo, logError } from '../log.js'
+import {
+  readWebsiteConfigDeployFields,
+  resolvePlatformFromDeployments
+} from './resolve-config.js'
+
+const DEPLOYMENT_TOOLS = '@ossy/deployment-tools'
+
+function runNpxDeploymentTools (deploymentArgs) {
+  const args = ['--yes', DEPLOYMENT_TOOLS, 'deployment', ...deploymentArgs]
+  logInfo({ message: `[@ossy/cli] publish: npx ${DEPLOYMENT_TOOLS} deployment ${deploymentArgs[0]} …` })
+  return new Promise((resolvePromise, reject) => {
+    const child = spawn('npx', args, { stdio: 'inherit', shell: true })
+    child.on('error', reject)
+    child.on('close', (code) => {
+      if (code === 0) resolvePromise()
+      else reject(new Error(`npx exited with code ${code}`))
+    })
+  })
+}
+
+/**
+ * Publish container deployments: default = one site (`deployment deploy`);
+ * `--all` = `deployment deploy-all` for the platform.
+ */
+export async function publish (options) {
+  const parsedArgs = arg({
+    '--username': String,
+    '-u': '--username',
+    '--authentication': String,
+    '-a': '--authentication',
+    '--domain': String,
+    '-d': '--domain',
+    '--platform': String,
+    '-p': '--platform',
+    '--config': String,
+    '-c': '--config',
+    '--platforms-path': String,
+    '-pp': '--platforms-path',
+    '--deployments-path': String,
+    '-dp': '--deployments-path',
+    '--all': Boolean
+  }, { argv: options })
+
+  const username = parsedArgs['--username']
+  const authentication = parsedArgs['--authentication']
+  const platformsPath = parsedArgs['--platforms-path']
+  const deploymentsPath = parsedArgs['--deployments-path']
+
+  if (!username || !authentication) {
+    logError({
+      message: '[@ossy/cli] publish: --username (-u) and --authentication (-a) are required.'
+    })
+    process.exit(1)
+  }
+  if (!platformsPath || !deploymentsPath) {
+    logError({
+      message: '[@ossy/cli] publish: --platforms-path (-pp) and --deployments-path (-dp) are required.'
+    })
+    process.exit(1)
+  }
+
+  let configPath = parsedArgs['--config']
+  if (!configPath) {
+    const cwdConfig = pathResolve(process.cwd(), 'src/config.js')
+    if (existsSync(cwdConfig)) {
+      configPath = cwdConfig
+    }
+  } else if (!existsSync(pathResolve(configPath))) {
+    logError({ message: `[@ossy/cli] publish: --config file not found: ${configPath}` })
+    process.exit(1)
+  }
+
+  const fromConfig = configPath ? readWebsiteConfigDeployFields(configPath) : {}
+
+  if (parsedArgs['--all']) {
+    let targetPlatform = parsedArgs['--platform'] || fromConfig.platform
+    if (!targetPlatform) {
+      logError({
+        message: '[@ossy/cli] publish --all: pass --platform (-p) or set platform in src/config.js (or --config).'
+      })
+      process.exit(1)
+    }
+    logInfo({ message: `[@ossy/cli] publish --all: platform=${targetPlatform}` })
+    await runNpxDeploymentTools([
+      'deploy-all',
+      '-u', username,
+      '-a', authentication,
+      '-p', targetPlatform,
+      '-pp', platformsPath,
+      '-dp', deploymentsPath
+    ])
+    return
+  }
+
+  let targetDomain = parsedArgs['--domain'] || fromConfig.domain
+  let targetPlatform = parsedArgs['--platform'] || fromConfig.platform
+
+  if (!targetPlatform && targetDomain && deploymentsPath) {
+    const resolved = resolvePlatformFromDeployments(deploymentsPath, targetDomain)
+    if (resolved && typeof resolved === 'object' && resolved.ambiguous) {
+      logError({
+        message: `[@ossy/cli] publish: domain "${targetDomain}" matches multiple platforms (${resolved.platforms.join(', ')}). Set platform in src/config.js or pass --platform (-p).`
+      })
+      process.exit(1)
+    }
+    targetPlatform = resolved
+  }
+
+  if (!targetDomain || !targetPlatform) {
+    logError({
+      message: '[@ossy/cli] publish: need --domain (-d) and --platform (-p), or src/config.js / --config with domain (and optional platform); platform can be inferred from deployments when domain is unique.'
+    })
+    process.exit(1)
+  }
+
+  logInfo({ message: `[@ossy/cli] publish: domain=${targetDomain} platform=${targetPlatform}` })
+
+  await runNpxDeploymentTools([
+    'deploy',
+    '-u', username,
+    '-a', authentication,
+    '-d', targetDomain,
+    '-p', targetPlatform,
+    '-pp', platformsPath,
+    '-dp', deploymentsPath
+  ])
+}

package/src/publish/resolve-config.js

@@ -0,0 +1,44 @@
+import { readFileSync } from 'fs'
+import { resolve } from 'path'
+import { globSync } from 'glob'
+
+/**
+ * Reads string `domain` / `platform` from a site `src/config.js` without executing it
+ * (config is often ESM with package-only imports).
+ *
+ * @param {string} configPath
+ * @returns {{ domain?: string, platform?: string }}
+ */
+export function readWebsiteConfigDeployFields (configPath) {
+  const abs = resolve(configPath)
+  const source = readFileSync(abs, 'utf8')
+
+  const pick = (key) => {
+    const m = source.match(new RegExp(`${key}\\s*:\\s*['"]([^'"]+)['"]`))
+    return m ? m[1] : undefined
+  }
+
+  const domain = pick('domain')
+  const platform = pick('platform') || pick('targetDeploymentPlatform')
+
+  return { domain, platform }
+}
+
+/**
+ * @param {string} deploymentsGlob
+ * @param {string} domain
+ * @returns {string | undefined | { ambiguous: true, platforms: string[] }}
+ */
+export function resolvePlatformFromDeployments (deploymentsGlob, domain) {
+  const filePaths = globSync(deploymentsGlob, { ignore: 'node_modules/**' })
+  const deployments = filePaths.flatMap((p) => JSON.parse(readFileSync(p, 'utf8')))
+  const matches = deployments.filter((d) => d.domain === domain)
+  if (matches.length === 0) {
+    return undefined
+  }
+  const platforms = [...new Set(matches.map((d) => d.targetDeploymentPlatform))]
+  if (platforms.length > 1) {
+    return { ambiguous: true, platforms }
+  }
+  return platforms[0]
+}