@ossy/cli 1.40.2 → 1.40.3

package/README.md

@@ -32,10 +32,10 @@ The contract for everything the platform can do is the **SDK action POJO** in [`
 | Local | `workspace use <id> \| list \| current` | Manage the active workspace (saved to `~/.config/ossy/config.json`) |
 | Local | `app init [dir]` | Scaffold a new Ossy app (default: current directory) |
 | Local | `app build` | Production build of the app in the current directory |
-| Local | `app validate` | Validate `src/config.js` (`workspaceId`, `resourceTemplates`) without calling the API |
+| Local | `app validate` | Validate `src/config.js` (`workspaceId`) without calling the API |
 | Dispatcher | `invoke <action.id>` | Invoke any Ossy SDK action by id (`ossy invoke --help` for the full catalog) |
-| Workflow | `app upload` | Read `resourceTemplates` from `src/config.js` and call `workspaces.import-resource-templates` |
-| Workflow | `app publish` | Upload resource templates and `build/` to the CMS (combines `app upload` + `upload-dir`) |
+| Workflow | `app upload` | Informational — schemas live in `*.schema.js` and are discovered at `app build` |
+| Workflow | `app publish` | Upload `build/` to the CMS and register the app domain |
 | Workflow | `upload-dir <dir> <location>` | Recursively mirror a local directory into the CMS (mkdir + upload per file) |
 
 If you need an endpoint that no verb wraps, reach for `ossy invoke` — it's the universal channel.
@@ -109,23 +109,23 @@ Options: e.g. `--config` for `src/config.js`. See `packages/app/README.md` for a
 
 ## App: publish
 
-Publishes a website: uploads resource templates to the CMS and mirrors the `build/` folder to a CMS location. Run from the **website package** directory (where `src/config.js` lives) so config values are read automatically.
+Publishes a built app: mirrors the `build/` folder into the CMS and registers the domain → workspace mapping. Run from the **app package** directory (where `src/config.js` lives) so config values are read automatically.
+
+Schemas are **not** uploaded by `app publish` — they come from installed packages' `*.schema.js` files and are merged into the app manifest at `app build` time.
 
 ```bash
 cd packages/my-website
-npm run build                          # produce build/ first
-ossy app publish                       # reads src/config.js, uploads templates + build/
+npm run build                          # produce build/ first (discovers schemas)
+ossy app publish                       # reads src/config.js, uploads build/
 ```
 
-**This is a two-step workflow:**
-1. Upload resource templates → `POST /resource-templates` (same as `app upload`).
-2. Upload `build/` to the CMS → `resources.create-directory` + `resources.upload` per file (same as `upload-dir`), mirrored to `/sites/{domain}` by default.
+**Workflow:**
+1. Upload `build/` to the CMS → `@ossy/resources/actions/create-directory` + `@ossy/resources/actions/upload` per file (same pattern as `upload-dir`), default destination `/@ossy/apps/{domain}`.
+2. Register `domain` → `workspaceId` via `POST /apps/domains`.
 
 ### Config extraction
 
-`publish` reads `workspaceId`, `apiUrl`, `domain`, and `resourceTemplates` from `src/config.js` **without executing** it (static regex + Babel AST parse), so imports like `@ossy/themes` that only resolve under Rollup are never run.
-
-If `resourceTemplates` cannot be extracted, the template upload step is skipped silently.
+`publish` reads `workspaceId`, `apiUrl`, and `domain` from `src/config.js` **without executing** it (static regex + Babel AST parse), so imports like `@ossy/themes` that only resolve under Rollup are never run.
 
 ### Authentication
 
@@ -140,7 +140,7 @@ ossy app publish
 ossy app publish \
   --config src/config.js \
   --build-dir ./build \
-  --build-dest /sites/my-site.se
+  --build-dest /@ossy/apps/my-site.se
 ```
 
 ### Options
@@ -150,8 +150,7 @@ ossy app publish \
 | `-a, --authentication` | Ossy API JWT (or `OSSY_API_KEY`, or `ossy auth login`) |
 | `-c, --config` | Path to `src/config.js` (default: `./src/config.js`) |
 | `--build-dir` | Override build directory (default: `<package>/build`) |
-| `--build-dest` | Override remote CMS location (default: `/sites/{domain}`) |
-| `--skip-resource-templates` | Skip the resource template upload step |
+| `--build-dest` | Override remote CMS location (default: `/@ossy/apps/{domain}`) |
 | `--api-url` | API base URL (or `OSSY_API_URL`; relative `apiUrl` in config is ignored) |
 
 ### CI example
@@ -166,23 +165,15 @@ ossy app publish \
 
 ## App: upload
 
-Upload resource templates to your workspace so they can be used in the UI.
-
-Wraps the SDK action **`workspaces.import-resource-templates`** and adds: reading `resourceTemplates` and `workspaceId` from `src/config.js` (so you don't have to inline the templates JSON yourself). If you already have the templates as a JSON object, the equivalent dispatcher call is:
-
-```bash
-ossy invoke workspaces.import-resource-templates --json '{"templates":[…]}'
-```
+**Deprecated as an upload workflow.** `ossy app upload` now prints guidance that schemas are defined in package `*.schema.js` files and discovered automatically at `app build` time — it does not POST to the API.
 
-Prefer **`--authentication` / `-a`** for the **Ossy API JWT** (same as **`app publish`**); it matches **`OSSY_API_KEY`** in CI.
+To import schemas manually (e.g. one-off workspace bootstrap), use the dispatcher:
 
 ```bash
-ossy app upload --authentication <ossy-api-jwt> --config src/config.js
-# optional: --api-url https://api.ossy.se/api/v0  (or set OSSY_API_URL)
-# In CI you may omit --authentication when OSSY_API_KEY is set
+ossy invoke @ossy/workspaces/actions/import-schemas --json '{"schemas":[…]}'
 ```
 
-When **`--config`** is omitted, **`./src/config.js`** is used if it exists (same as **`app publish`**).
+The low-level HTTP helper `postSchemas()` in `upload-schemas.js` targets `POST /schemas` when you need a direct fetch from custom tooling.
 
 ### Config consistency
 
@@ -190,28 +181,24 @@ When **`--config`** is omitted, **`./src/config.js`** is used if it exists (same
 
 ### Workflow example
 
-Prefer **`app publish`** so templates and build files are uploaded together. For template-only updates, `app upload` still works.
+Prefer **`app publish`** after `app build` so the built site is deployed. Schemas ship with the build manifest — no separate upload step.
 
 ```yaml
-name: "[CMS] Upload resource templates"
+name: Deploy app
 
 on:
   workflow_dispatch:
 
 jobs:
-  upload-resource-templates:
-    name: Upload resource templates
+  publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: "16"
-      - name: Upload
-        run: |
-          npx --yes @ossy/cli app upload \
-            --authentication ${{ secrets.OSSY_API_KEY }} \
-            --config src/config.js
+          node-version: "20"
+      - run: npm ci && npx ossy app build
+      - run: npx ossy app publish --authentication ${{ secrets.OSSY_API_KEY }}
 ```
 
 ### app validate
@@ -229,7 +216,7 @@ When **`--config`** is omitted, **`./src/config.js`** is used if it exists.
 | Argument | Description | Required |
 |----------|-------------|----------|
 | --authentication, -a | **Ossy API JWT** (primary; same role as **`OSSY_API_KEY`**) | Yes (upload only) |
-| --config, -c | App config (`workspaceId`, `resourceTemplates`, …) | Optional if `./src/config.js` exists |
+| --config, -c | App config (`workspaceId`, …) | Optional if `./src/config.js` exists |
 | --api-url | API base URL for upload (`…/api/v0`) | No |
 
 ## Upload a directory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/cli",
-  "version": "1.40.2",
+  "version": "1.40.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ossy-se/packages.git"
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@babel/parser": "^7.28.6",
-    "@ossy/app": "^1.40.2",
-    "@ossy/sdk": "^1.40.2",
+    "@ossy/app": "^1.40.3",
+    "@ossy/sdk": "^1.40.3",
     "arg": "^5.0.2",
     "glob": "^13.0.6"
   },
@@ -33,5 +33,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "2b8745d57fee8b6c08787e2755b4df489291a5cd"
+  "gitHead": "a0d89185a17f8de8ce328c3a648c108ff1d61d8f"
 }

package/src/app/cli.js

@@ -47,7 +47,7 @@ const upload = (options) => {
 
   logInfo({
     message:
-      '[@ossy/cli] Resource templates are now defined in *.resource.js package files and are ' +
+      '[@ossy/cli] Resource templates are now defined in *.schema.js package files and are ' +
       'automatically discovered at build time. Use `ossy app publish` to deploy.',
   })
 }

package/src/app/load-config.js

@@ -33,7 +33,7 @@ function astToValue (node) {
  * Avoids resolving imports such as `@ossy/themes` in CI.
  *
  * @param {string} configPath Absolute or cwd-relative path to `src/config.js`
- * @returns {{ workspaceId?: string, apiUrl?: string, domain?: string, resourceTemplates?: object[] }}
+ * @returns {{ workspaceId?: string, apiUrl?: string, domain?: string, schemas?: object[] }}
  */
 export function readAppConfig (configPath) {
   const abs = resolve(configPath)
@@ -44,7 +44,7 @@ export function readAppConfig (configPath) {
     return m ? m[1] : undefined
   }
 
-  let resourceTemplates
+  let schemas
   try {
     const ast = parse(source, { sourceType: 'module' })
     for (const node of ast.program.body) {
@@ -54,19 +54,19 @@ export function readAppConfig (configPath) {
       for (const prop of obj.properties) {
         if (prop.type !== 'ObjectProperty') continue
         const key = prop.key.name ?? prop.key.value
-        if (key === 'resourceTemplates' && prop.value.type === 'ArrayExpression') {
-          resourceTemplates = astToValue(prop.value)
+        if (key === 'schemas' && prop.value.type === 'ArrayExpression') {
+          schemas = astToValue(prop.value)
         }
       }
     }
   } catch {
-    // Ignore parse errors — resourceTemplates stays undefined
+    // Ignore parse errors — schemas stays undefined
   }
 
   return {
     workspaceId: pickString('workspaceId'),
     apiUrl: pickString('apiUrl'),
     domain: pickString('domain'),
-    resourceTemplates,
+    schemas,
   }
 }

package/src/app/publish.js

@@ -10,7 +10,7 @@ import { prepareFileUpload, uploadFileToUrl } from '../file.js'
 import {
   requireAppAuthentication,
   resolveApiBaseUrlForUpload,
-} from './upload-resource-templates.js'
+} from './upload-schemas.js'
 import { readAppConfig } from './load-config.js'
 
 function normaliseLoc (loc) {

package/src/app/{upload-resource-templates.js → upload-schemas.js}

@@ -28,17 +28,17 @@ export function requireAppAuthentication (token, label) {
 
 /**
  * POST workspace-imported resource templates to the Ossy API.
- * @param {{ apiBaseUrl: string, token: string, workspaceId: string, resourceTemplates: unknown[] }} opts
+ * @param {{ apiBaseUrl: string, token: string, workspaceId: string, schemas: unknown[] }} opts
  * @returns {Promise<Response>}
  */
-export function postResourceTemplates ({
+export function postSchemas ({
   apiBaseUrl,
   token,
   workspaceId,
-  resourceTemplates,
+  schemas,
 }) {
   const base = apiBaseUrl.replace(/\/$/, '')
-  const url = `${base}/resource-templates`
+  const url = `${base}/schemas`
   const auth = normalizeAuthorizationToken(token)
   return fetch(url, {
     method: 'POST',
@@ -47,7 +47,7 @@ export function postResourceTemplates ({
       'Content-Type': 'application/json',
       workspaceId,
     },
-    body: JSON.stringify(resourceTemplates),
+    body: JSON.stringify(schemas),
   })
 }
 

package/src/call/cli.js

@@ -9,19 +9,36 @@ const ACTIONS = Object.values(Sdk).filter(
     v
     && typeof v === 'object'
     && typeof v.id === 'string'
-    && v.id.includes('/')
+    && v.id.includes('/actions/'),
 )
 
+/** @param {string} actionId */
+function actionDomain (actionId) {
+  const match = /^@ossy\/([^/]+)\/actions\//.exec(actionId)
+  if (match) return match[1]
+  return actionId.split('/')[0]
+}
+
+/** Slash id, dot alias, and legacy dot alias without the `@ossy/` prefix. */
+function actionLookupKeys (actionId) {
+  const keys = new Set([actionId, actionId.replace(/\//g, '.')])
+  if (actionId.startsWith('@ossy/')) {
+    keys.add(actionId.slice('@ossy/'.length).replace(/\//g, '.'))
+  }
+  return keys
+}
+
 const ACTION_BY_ID = new Map()
 for (const action of ACTIONS) {
-  ACTION_BY_ID.set(action.id, action)
-  ACTION_BY_ID.set(action.id.replace(/\//g, '.'), action)
+  for (const key of actionLookupKeys(action.id)) {
+    ACTION_BY_ID.set(key, action)
+  }
 }
 
 function listActionsByDomain () {
   const grouped = new Map()
   for (const action of ACTIONS) {
-    const domain = action.id.split('/')[0]
+    const domain = actionDomain(action.id)
     if (!grouped.has(domain)) grouped.set(domain, [])
     grouped.get(domain).push(action.id)
   }

package/src/index.js

@@ -57,7 +57,7 @@ Options (login):
     init      Scaffold a new Ossy app (default dir: current directory)
     build     Production build of the app in the current directory
     upload    Upload resource templates from src/config.js to the workspace
-              (wraps the SDK action workspaces.import-resource-templates)
+              (wraps the SDK action workspaces.import-schemas)
     validate  Validate ossy app config and resource templates locally
     publish   Upload resource templates and build/ to the CMS
               (resource templates + build files to /sites/{domain})
@@ -75,7 +75,7 @@ Options (publish):
   -c, --config              Path to src/config.js
   --build-dir               Override build directory (default: <package>/build)
   --build-dest              Override remote CMS location (default: /sites/{domain})
-  --skip-resource-templates Skip resource template upload
+  --skip-schemas Skip resource template upload
   --api-url                 API base URL for API calls
 `,
   'upload-dir': `ossy upload-dir <localDir> <remoteLocation> [options]