@ossy/cli 1.32.0 → 1.32.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/cli",
-  "version": "1.32.0",
+  "version": "1.32.2",
   "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.32.0",
-    "@ossy/sdk": "^1.32.0",
+    "@ossy/app": "^1.32.2",
+    "@ossy/sdk": "^1.32.2",
     "arg": "^5.0.2",
     "glob": "^13.0.6"
   },
@@ -33,5 +33,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "08b323d32d21600ba9519ad3f73fd5738556a68f"
+  "gitHead": "5c17e379298f7027f1dbdcf064a4aff69d1497d5"
 }

package/src/app/cli.js

@@ -6,10 +6,6 @@ import { logInfo, logError } from '../log.js'
 import { resolveAppConfigPath } from '../resolve-app-config-path.js'
 import { getAuth } from '../state.js'
 import { init } from '../init/cli.js'
-import {
-  postResourceTemplates,
-  resolveApiBaseUrlForUpload,
-} from './upload-resource-templates.js'
 import { publish } from './publish.js'
 
 const resolveConfigImport = (filePath) =>
@@ -27,7 +23,6 @@ const upload = (options) => {
   }, { argv: options })
 
   const token = getAuth({ flag: parsedArgs['--authentication'] })
-  const apiUrlFlag = parsedArgs['--api-url']
 
   if (!token) {
     logError({
@@ -50,50 +45,11 @@ const upload = (options) => {
     process.exit(1)
   }
 
-  logInfo({ message: '[@ossy/cli] Reading config...' })
-
-  return resolveConfigImport(filePath)
-    .then((module) => {
-      const config = module?.default ?? module
-      const workspaceId = config?.workspaceId
-      const resourceTemplates = config?.resourceTemplates
-
-      if (!workspaceId) {
-        logError({ message: '[@ossy/cli] No workspaceId in config' })
-        process.exit(1)
-      }
-      if (!resourceTemplates) {
-        logError({ message: '[@ossy/cli] No resourceTemplates in config' })
-        process.exit(1)
-      }
-
-      const apiBaseUrl = resolveApiBaseUrlForUpload({
-        flag: apiUrlFlag,
-        envVar: process.env.OSSY_API_URL,
-        configApiUrl: config?.apiUrl,
-      })
-
-      logInfo({ message: '[@ossy/cli] Uploading resource templates...' })
-
-      return postResourceTemplates({
-        apiBaseUrl,
-        token,
-        workspaceId,
-        resourceTemplates,
-      })
-        .then((response) => {
-          if (!response.ok) throw new Error(`Upload failed: ${response.status}`)
-          logInfo({ message: '[@ossy/cli] Done' })
-        })
-        .catch((error) => {
-          logError({ message: '[@ossy/cli] Error', error })
-          process.exit(1)
-        })
-    })
-    .catch((error) => {
-      logError({ message: '[@ossy/cli] Error', error })
-      process.exit(1)
-    })
+  logInfo({
+    message:
+      '[@ossy/cli] Resource templates are now defined in *.resource.js package files and are ' +
+      'automatically discovered at build time. Use `ossy app publish` to deploy.',
+  })
 }
 
 const validate = (options) => {
@@ -121,23 +77,9 @@ const validate = (options) => {
     .then((module) => {
       const config = module?.default ?? module
       const workspaceId = config?.workspaceId
-      const resourceTemplates = config?.resourceTemplates
 
       const errors = []
       if (!workspaceId) errors.push('Missing workspaceId')
-      if (!resourceTemplates) {
-        errors.push('Missing resourceTemplates')
-      } else if (!Array.isArray(resourceTemplates)) {
-        errors.push('resourceTemplates must be an array')
-      } else {
-        resourceTemplates.forEach((t, i) => {
-          if (!t.id) errors.push(`Template ${i}: missing id`)
-          if (!t.name) errors.push(`Template ${i}: missing name`)
-          if (!t.fields || !Array.isArray(t.fields)) {
-            errors.push(`Template ${i}: fields must be an array`)
-          }
-        })
-      }
 
       if (errors.length > 0) {
         console.error('[@ossy/cli] Validation failed:')

package/src/app/load-config.js

@@ -2,96 +2,28 @@ import { readFileSync } from 'fs'
 import { resolve } from 'path'
 import { parse } from '@babel/parser'
 
-/** @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}
+ * Converts a Babel AST value node to a plain JS value.
+ * Handles strings, numbers, booleans, null, arrays, and plain objects.
  */
-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
-    }
+function astToValue (node) {
+  if (!node) return undefined
+  if (node.type === 'StringLiteral') return node.value
+  if (node.type === 'NumericLiteral') return node.value
+  if (node.type === 'BooleanLiteral') return node.value
+  if (node.type === 'NullLiteral') return null
+  if (node.type === 'ArrayExpression') {
+    return node.elements.map(el => el ? astToValue(el) : null)
   }
-  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
+  if (node.type === 'ObjectExpression') {
+    const obj = {}
+    for (const prop of node.properties) {
+      if (prop.type === 'ObjectProperty') {
+        const key = prop.key.name ?? prop.key.value
+        obj[key] = astToValue(prop.value)
+      }
+    }
+    return obj
   }
   return undefined
 }
@@ -101,7 +33,7 @@ function extractResourceTemplatesFromSource (source) {
  * 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?: unknown[] }}
+ * @returns {{ workspaceId?: string, apiUrl?: string, domain?: string, resourceTemplates?: object[] }}
  */
 export function readAppConfig (configPath) {
   const abs = resolve(configPath)
@@ -114,9 +46,21 @@ export function readAppConfig (configPath) {
 
   let resourceTemplates
   try {
-    resourceTemplates = extractResourceTemplatesFromSource(source)
+    const ast = parse(source, { sourceType: 'module' })
+    for (const node of ast.program.body) {
+      if (node.type !== 'ExportDefaultDeclaration') continue
+      const obj = node.declaration
+      if (obj.type !== 'ObjectExpression') continue
+      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)
+        }
+      }
+    }
   } catch {
-    resourceTemplates = undefined
+    // Ignore parse errors — resourceTemplates stays undefined
   }
 
   return {

package/src/app/publish.js

@@ -8,7 +8,6 @@ import { getAuth } from '../state.js'
 import { walk } from '../upload-dir/cli.js'
 import { prepareFileUpload, uploadFileToUrl } from '../file.js'
 import {
-  postResourceTemplates,
   requireAppAuthentication,
   resolveApiBaseUrlForUpload,
 } from './upload-resource-templates.js'
@@ -28,7 +27,6 @@ export async function publish (options) {
     '-c': '--config',
     '--build-dir': String,
     '--build-dest': String,
-    '--skip-resource-templates': Boolean,
     '--api-url': String,
   }, { argv: options })
 
@@ -45,7 +43,7 @@ export async function publish (options) {
   }
 
   const config = readAppConfig(configPath)
-  const { workspaceId, apiUrl: configApiUrl, domain, resourceTemplates } = config
+  const { workspaceId, apiUrl: configApiUrl, domain } = config
 
   if (!workspaceId) {
     logError({ message: '[@ossy/cli] app publish: no workspaceId in config' })
@@ -69,30 +67,7 @@ export async function publish (options) {
     process.exit(1)
   }
 
-  // Step 1: upload resource templates
-  if (!parsedArgs['--skip-resource-templates']) {
-    if (Array.isArray(resourceTemplates) && resourceTemplates.length > 0) {
-      logInfo({ message: '[@ossy/cli] app publish: uploading resource templates…' })
-      const res = await postResourceTemplates({
-        apiBaseUrl,
-        token: authToken,
-        workspaceId,
-        resourceTemplates,
-      })
-      if (!res.ok) {
-        const text = await res.text().catch(() => '')
-        logError({
-          message: `[@ossy/cli] app publish: resource template upload failed: HTTP ${res.status}${text ? ` — ${text.slice(0, 200)}` : ''}`,
-        })
-        process.exit(1)
-      }
-      logInfo({ message: '[@ossy/cli] app publish: resource templates uploaded' })
-    } else {
-      logInfo({ message: '[@ossy/cli] app publish: no resource templates in config, skipping' })
-    }
-  }
-
-  // Step 2: upload build/ to CMS
+  // Step 1: upload build/ to CMS
   const packageRoot = path.join(path.dirname(configPath), '..')
   const buildDir = parsedArgs['--build-dir']
     ? path.resolve(parsedArgs['--build-dir'])