@ossy/cli 0.16.8 → 0.16.10

package/README.md

@@ -9,7 +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`, then upload `resourceTemplates` and **site build artifacts** (S3 presign + CMS resource) when `workspaceId` is set (see below) |
+| `publish` | Queue a container deployment via `@ossy/deployment-tools` (**temporary**; see below), then upload `resourceTemplates` and **site build artifacts** (S3 presign + CMS resource) when `workspaceId` is set |
 | `cms upload` | Upload resource templates only (same API as publish’s upload step) |
 | `cms validate` | Validate ossy config and resource templates |
 
@@ -26,6 +26,25 @@ Options: `--pages`, `--config`, `--destination`. See `@ossy/app` for details.
 
 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.
 
+### Temporary: no execution of `src/config.js` for CMS steps
+
+After deploy succeeds, **`publish`** still needs **`workspaceId`**, **`apiUrl`** (optional, for absolute URLs), and **`resourceTemplates`** from `src/config.js`. Those values are **not** loaded with `import()` anymore: running the real config in plain Node would execute imports such as `@ossy/themes`, which are only meant to be resolved during **`ossy build`** (Rollup).
+
+Instead, the CLI uses a **temporary** pipeline:
+
+- **`workspaceId`** and **`apiUrl`** — read with **string-literal regexes** (same idea as deploy hints).
+- **`resourceTemplates`** — parsed with **`@babel/parser`** from `export default { … }` when that array is **JSON-like literals only** (no function calls, variables, spreads, or template literals in that subtree).
+
+If `resourceTemplates` cannot be extracted, template upload is skipped. This is a **stopgap** until publish is driven by build output or platform events (see **Future direction**).
+
+### Future direction (planned)
+
+The explicit **`deployment deploy`** step (SQS / deployment queue from **`@ossy/deployment-tools`**) is **intended to go away**: the platform should **react to a website upload / artifact event** (e.g. after the container image or site bundle is published) and roll out without the CLI calling deploy. When that exists, **`publish`** can shrink to CMS-only steps (resource templates + site artifacts), or those can move to separate workflows entirely. Treat the current **deploy + follow-ups** combo as **temporary** coupling.
+
+---
+
+Details:
+
 ```bash
 cd packages/my-website
 npx @ossy/cli publish \
@@ -39,8 +58,8 @@ npx @ossy/cli publish \
 - **`--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.
-- **Resource templates** — After a successful deploy, the CLI loads `./src/config.js` (or `--config`). If it exports **`workspaceId`** and a non-empty **`resourceTemplates`** array, they are **POST**ed to **`{api}/resource-templates`** with the **`workspaceId`** header (same as the CMS). Skipped when **`--skip-resource-templates`** is set, or when `workspaceId` / `resourceTemplates` are missing.
-- **Site artifacts** — If **`workspaceId`** is set and **`build/`** exists next to `src/` (i.e. run **`npm run build`** first), the CLI calls **`/site-artifacts/presign-batch`**, **PUT**s each file to S3, then **`/site-artifacts/commit-batch`** so a **`@ossy/platform/site-artifact-batch`** resource is created in the CMS. Skipped with **`--skip-site-artifacts`**, when there is no **`build/`**, or when **`workspaceId`** is missing. Override the build output directory with **`--site-artifacts-build-dir`** (absolute or cwd-relative).
+- **Resource templates** — After a successful deploy, the CLI reads **`workspaceId`** / **`resourceTemplates`** from `./src/config.js` (or `--config`) using the **static extraction** described above (not `import()`). If **`workspaceId`** is set and **`resourceTemplates`** is a non-empty array, they are **POST**ed to **`{api}/resource-templates`** with the **`workspaceId`** header (same as the CMS). Skipped when **`--skip-resource-templates`** is set, or when `workspaceId` / `resourceTemplates` are missing or not extractable.
+- **Site artifacts** — Uses the same **static `workspaceId` / `apiUrl` extraction** as resource templates. If **`workspaceId`** is set and **`build/`** exists next to `src/` (i.e. run **`npm run build`** first), the CLI calls **`/site-artifacts/presign-batch`**, **PUT**s each file to S3, then **`/site-artifacts/commit-batch`** so a **`@ossy/platform/site-artifact-batch`** resource is created in the CMS. Skipped with **`--skip-site-artifacts`**, when there is no **`build/`**, or when **`workspaceId`** is missing. Override the build output directory with **`--site-artifacts-build-dir`** (absolute or cwd-relative).
 - **`--cms-authentication`** — Optional token used only for CMS/API steps (templates + site artifacts); defaults to **`--authentication`** (deployment token).
 - **`--api-url`** — Optional API base for CMS calls (e.g. `https://api.ossy.se/api/v0`). Otherwise **`OSSY_API_URL`**, else an **absolute** `apiUrl` from config, else `https://api.ossy.se/api/v0`. Relative app `apiUrl` values (e.g. `/@ossy`) are ignored unless you pass **`--api-url`** or set **`OSSY_API_URL`**.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/cli",
-  "version": "0.16.8",
+  "version": "0.16.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ossy-se/packages.git"
@@ -17,7 +17,8 @@
   "license": "MIT",
   "bin": "./src/index.js",
   "dependencies": {
-    "@ossy/app": "^0.15.8",
+    "@babel/parser": "^7.28.6",
+    "@ossy/app": "^0.15.10",
     "arg": "^5.0.2",
     "glob": "^10.3.10"
   },
@@ -29,5 +30,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "6514a64dbe2043b6f571404433779d9193a24895"
+  "gitHead": "cc54553550674b98f8a53bb3249307e06c4daa82"
 }

package/src/publish/load-website-config.js

@@ -1,8 +1,138 @@
+import { readFileSync } from 'fs'
 import { resolve } from 'path'
+import { parse } from '@babel/parser'
 import { pathToFileURL } from 'url'
 
+/** @returns {unknown | undefined} `undefined` if the AST cannot be reduced to JSON-like data */
+function astNodeToLiteralValue (node) {
+  if (!node) return undefined
+  switch (node.type) {
+    case 'StringLiteral':
+    case 'BooleanLiteral':
+      return node.value
+    case 'NumericLiteral':
+      return node.value
+    case 'NullLiteral':
+      return null
+    case 'UnaryExpression':
+      if (node.operator === '-' && node.argument?.type === 'NumericLiteral') {
+        return -node.argument.value
+      }
+      return undefined
+    case 'ObjectExpression': {
+      const o = Object.create(null)
+      for (const p of node.properties) {
+        if (p.type !== 'ObjectProperty' || p.computed) return undefined
+        if (p.shorthand) return undefined
+        const key =
+          p.key.type === 'Identifier'
+            ? p.key.name
+            : p.key.type === 'StringLiteral'
+              ? p.key.value
+              : undefined
+        if (key === undefined) return undefined
+        const v = astNodeToLiteralValue(p.value)
+        if (v === undefined) return undefined
+        o[key] = v
+      }
+      return o
+    }
+    case 'ArrayExpression': {
+      const arr = []
+      for (const el of node.elements) {
+        if (el === null) {
+          arr.push(null)
+          continue
+        }
+        if (el.type === 'SpreadElement') return undefined
+        const v = astNodeToLiteralValue(el)
+        if (v === undefined) return undefined
+        arr.push(v)
+      }
+      return arr
+    }
+    default:
+      return undefined
+  }
+}
+
+/**
+ * Reads `resourceTemplates` from `export default { ... }` when it is a literal array
+ * (no imports, calls, or templates). Matches typical OSSY website configs.
+ *
+ * @param {string} source
+ * @returns {unknown[] | undefined}
+ */
+function extractResourceTemplatesFromSource (source) {
+  const ast = parse(source, {
+    sourceType: 'module',
+    allowAwaitOutsideFunction: true,
+    errorRecovery: false,
+  })
+
+  let obj = null
+  for (const stmt of ast.program.body) {
+    if (stmt.type !== 'ExportDefaultDeclaration') continue
+    const decl = stmt.declaration
+    if (decl.type === 'ObjectExpression') {
+      obj = decl
+      break
+    }
+  }
+  if (!obj) return undefined
+
+  for (const prop of obj.properties) {
+    if (prop.type !== 'ObjectProperty' || prop.computed) continue
+    const key =
+      prop.key.type === 'Identifier'
+        ? prop.key.name
+        : prop.key.type === 'StringLiteral'
+          ? prop.key.value
+          : null
+    if (key !== 'resourceTemplates') continue
+    if (prop.value.type !== 'ArrayExpression') return undefined
+    const v = astNodeToLiteralValue(prop.value)
+    return Array.isArray(v) ? v : undefined
+  }
+  return undefined
+}
+
+/**
+ * Reads fields needed for `ossy publish` follow-up steps **without executing** `config.js`.
+ * Avoids resolving imports such as `@ossy/themes` in CI (publish runs after deploy, outside Rollup).
+ *
+ * **Temporary** — prefer a build-time `publish-meta.json` or platform events once deploy is decoupled
+ * from the CLI; see `packages/cli/README.md` → *Publish* → *Temporary: no execution of src/config.js*.
+ *
+ * @param {string} configPath Absolute or cwd-relative path to `src/config.js`
+ * @returns {{ workspaceId?: string, apiUrl?: string, resourceTemplates?: unknown[] }}
+ */
+export function readPublishFieldsFromWebsiteConfig (configPath) {
+  const abs = resolve(configPath)
+  const source = readFileSync(abs, 'utf8')
+
+  const pickString = (key) => {
+    const m = source.match(new RegExp(`\\b${key}\\s*:\\s*['"]([^'"]*)['"]`, 'm'))
+    return m ? m[1] : undefined
+  }
+
+  let resourceTemplates
+  try {
+    resourceTemplates = extractResourceTemplatesFromSource(source)
+  } catch {
+    resourceTemplates = undefined
+  }
+
+  return {
+    workspaceId: pickString('workspaceId'),
+    apiUrl: pickString('apiUrl'),
+    resourceTemplates,
+  }
+}
+
 /**
- * Loads app `config.js` (ESM) for publish-side steps (e.g. resource template upload).
+ * @deprecated Prefer {@link readPublishFieldsFromWebsiteConfig} for publish — dynamic import
+ * runs all side effects and `import`s in config (e.g. `@ossy/themes`), which breaks in plain Node.
  * @param {string} configPath Absolute or cwd-relative path to config file
  */
 export async function loadWebsiteConfig (configPath) {

package/src/publish/resource-templates-after-publish.js

@@ -1,5 +1,5 @@
 import { logInfo } from '../log.js'
-import { loadWebsiteConfig } from './load-website-config.js'
+import { readPublishFieldsFromWebsiteConfig } from './load-website-config.js'
 import {
   postResourceTemplates,
   resolveApiBaseUrlForUpload,
@@ -13,9 +13,9 @@ export async function maybeUploadResourceTemplatesAfterPublish ({
   cmsToken,
   apiUrlFlag,
 }) {
-  const config = await loadWebsiteConfig(configPath)
-  const workspaceId = config?.workspaceId
-  const resourceTemplates = config?.resourceTemplates
+  const config = readPublishFieldsFromWebsiteConfig(configPath)
+  const workspaceId = config.workspaceId
+  const resourceTemplates = config.resourceTemplates
 
   if (!workspaceId) {
     logInfo({

package/src/publish/site-artifacts-after-publish.js

@@ -2,7 +2,7 @@ import { readdir, stat, readFile } from 'fs/promises'
 import { existsSync } from 'fs'
 import path from 'path'
 import { logInfo } from '../log.js'
-import { loadWebsiteConfig } from './load-website-config.js'
+import { readPublishFieldsFromWebsiteConfig } from './load-website-config.js'
 import { resolveApiBaseUrlForUpload } from '../cms/upload-resource-templates.js'
 
 const MAX_FILES = 200
@@ -83,8 +83,8 @@ export async function maybeUploadSiteArtifactsAfterPublish ({
   apiUrlFlag,
   buildDir: buildDirOpt,
 }) {
-  const config = await loadWebsiteConfig(configPath)
-  const workspaceId = config?.workspaceId
+  const config = readPublishFieldsFromWebsiteConfig(configPath)
+  const workspaceId = config.workspaceId
 
   if (!workspaceId) {
     logInfo({
@@ -109,7 +109,7 @@ export async function maybeUploadSiteArtifactsAfterPublish ({
   const apiBaseUrl = resolveApiBaseUrlForUpload({
     flag: apiUrlFlag,
     envVar: process.env.OSSY_API_URL,
-    configApiUrl: config?.apiUrl,
+    configApiUrl: config.apiUrl,
   })
 
   const files = await collectBuildFiles(buildDir)