@ossy/app 1.15.0 → 1.15.2

package/cli/build.task.js

@@ -0,0 +1,74 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import url from 'node:url'
+import { pathToFileURL } from 'node:url'
+import { createRequire } from 'node:module'
+import arg from 'arg'
+import { rollup } from 'rollup'
+import babel from '@rollup/plugin-babel'
+import { nodeResolve as resolveDependencies } from '@rollup/plugin-node-resolve'
+import resolveCommonJsDependencies from '@rollup/plugin-commonjs'
+import json from '@rollup/plugin-json'
+import replace from '@rollup/plugin-replace'
+import nodeExternals from 'rollup-plugin-node-externals'
+import getPlatformFiles from './getPlatformFiles.task.js'
+
+function resetBuildDir (buildPath) {
+  fs.rmSync(buildPath, { recursive: true, force: true })
+  fs.mkdirSync(buildPath, { recursive: true })
+}
+
+export async function build (cliArgs = []) {
+
+  const options = arg({
+    '--config': String,
+    '-c': '--config',
+  }, { argv: cliArgs })
+
+  const cwd = process.cwd()
+  const buildPath = path.resolve(cwd, 'build')
+  const srcDir = path.resolve(cwd, 'src')
+  const publicDir = path.resolve(cwd, 'public')
+
+  resetBuildDir(buildPath)
+  const entries = await getPlatformFiles(srcDir)
+
+  if (publicDir && fs.existsSync(publicDir)) {
+    fs.cpSync(publicDir, path.join(buildPath, 'public'), { recursive: true, force: true })
+  }
+
+  const bundle = await rollup({
+    input: entries,
+    plugins: [
+      replace({
+        preventAssignment: true,
+        'process.env.NODE_ENV': '"production"',
+      }),
+      json(),
+      nodeExternals({
+        deps: false,
+        devDeps: true,
+        peerDeps: false,
+        packagePath: path.join(process.cwd(), 'package.json'),
+      }),
+      resolveCommonJsDependencies(),
+      resolveDependencies({ preferBuiltins: true }),
+      babel({
+        babelHelpers: 'bundled',
+        extensions: ['.jsx', '.tsx'],
+        presets: [['@babel/preset-react', { runtime: 'automatic' }]],
+      }),
+    ],
+  })
+
+  await bundle.write({
+    dir: buildPath,
+    format: 'esm',
+    // entryFileNames: (chunk) => (chunk.name === 'server' ? 'ssr/app.mjs' : 'public/static/app.js'),
+    chunkFileNames: 'public/static/chunks/[name]-[hash].js',
+    plugins: [],
+  })
+
+  await bundle.close()
+
+}

package/cli/get-files.task copy.js

@@ -0,0 +1,234 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import url from 'node:url'
+import { pathToFileURL } from 'node:url'
+import { createRequire } from 'node:module'
+import arg from 'arg'
+import { rollup } from 'rollup'
+import babel from '@rollup/plugin-babel'
+import { nodeResolve as resolveDependencies } from '@rollup/plugin-node-resolve'
+import resolveCommonJsDependencies from '@rollup/plugin-commonjs'
+import json from '@rollup/plugin-json'
+import replace from '@rollup/plugin-replace'
+import nodeExternals from 'rollup-plugin-node-externals'
+
+export const PAGE_FILE_PATTERN = /\.page\.(jsx?|tsx?)$/
+export const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
+export const TASK_FILE_PATTERN = /\.task\.(mjs|cjs|js)$/
+const RESOURCE_TEMPLATE_FILE_PATTERN = /\.resource\.(mjs|cjs|js)$/
+
+export const OSSY_GEN_DIRNAME = '.ossy'
+export const OSSY_GEN_ENTRIES_BASENAME = 'entries.generated.json'
+export const OSSY_GEN_PAGES_BASENAME = 'pages.generated.json'
+export const OSSY_GEN_API_BASENAME = 'api.generated.json'
+export const OSSY_GEN_TASKS_BASENAME = 'tasks.generated.json'
+export const OSSY_RESOURCE_TEMPLATES_OUT = 'resource-templates.generated.json'
+
+function resetBuildDir (buildPath) {
+  fs.rmSync(buildPath, { recursive: true, force: true })
+  const dir = path.join(buildPath, OSSY_GEN_DIRNAME)
+  fs.mkdirSync(dir, { recursive: true })
+  return dir
+}
+
+function relToGeneratedImport (generatedAbs, targetAbs) {
+  return path.relative(path.dirname(generatedAbs), targetAbs).replace(/\\/g, '/')
+}
+
+export function discoverFilesByPattern (srcDir, filePattern) {
+  const dir = path.resolve(srcDir)
+  if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
+    return []
+  }
+  const files = []
+  const walk = (d) => {
+    const entries = fs.readdirSync(d, { withFileTypes: true })
+    for (const e of entries) {
+      const full = path.join(d, e.name)
+      if (e.isDirectory()) walk(full)
+      else if (filePattern.test(e.name)) files.push(full)
+    }
+  }
+  walk(dir)
+  return files
+}
+
+
+function writeJson (filePath, data) {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true })
+  fs.writeFileSync(filePath, `${JSON.stringify(data, null, 2)}\n`, 'utf8')
+}
+
+function filePathToRoute (filePath, srcDir) {
+  const rel = path.relative(srcDir, filePath).replace(/\\/g, '/')
+  let pathPart = rel.replace(PAGE_FILE_PATTERN, '').replace(/\/index$/, '').replace(/\/home$/, '') || 'home'
+  if (pathPart === 'index' || pathPart === 'home') pathPart = 'home'
+  const id = pathPart === 'home' ? 'home' : pathPart.replace(/\//g, '-')
+  const routePath = pathPart === 'home' ? '/' : '/' + pathPart
+  return { id, path: routePath }
+}
+
+function pageRouteFromSource (pageAbsPath, srcDir) {
+  const derived = filePathToRoute(pageAbsPath, srcDir)
+  try {
+    const src = fs.readFileSync(pageAbsPath, 'utf8')
+    const metaIdx = src.indexOf('export const metadata')
+    if (metaIdx === -1) return derived
+    const after = src.slice(metaIdx)
+    const id = after.match(/\bid\s*:\s*['"]([^'"]+)['"]/)?.[1] ?? derived.id
+    const strPath = after.match(/\bpath\s*:\s*['"]([^'"]+)['"]/)?.[1]
+    if (strPath) return { id, path: strPath }
+    const pathObjBody = after.match(/\bpath\s*:\s*\{([\s\S]*?)\}/)?.[1]
+    if (pathObjBody) {
+      const languagePathEntries = [...pathObjBody.matchAll(/([A-Za-z0-9_]+)\s*:\s*['"]([^'"]+)['"]/g)]
+      if (languagePathEntries.length > 0) {
+        return {
+          id,
+          path: Object.fromEntries(languagePathEntries.map(([, language, routePath]) => [language, routePath])),
+        }
+      }
+    }
+    return { id, path: derived.path }
+  } catch {
+    return derived
+  }
+}
+
+function generateHydrateEntry ({ pageFiles, srcDir, stubAbsPath }) {
+  const seenIds = new Set()
+  const pageLines = pageFiles.map((f) => {
+    const { id } = pageRouteFromSource(f, srcDir)
+    if (seenIds.has(id)) {
+      throw new Error(`[@ossy/app] Duplicate page id "${id}" (${f}). Pages need unique ids.`)
+    }
+    seenIds.add(id)
+    const rel = relToGeneratedImport(stubAbsPath, f)
+    return `  ${JSON.stringify(id)}: () => import('./${rel}'),`
+  })
+  return [
+    '// Generated by @ossy/app — do not edit',
+    "import { createElement } from 'react'",
+    "import { hydrateRoot } from 'react-dom/client'",
+    "import { App } from '@ossy/connected-components'",
+    'const config = window.__INITIAL_APP_CONFIG__ || {}',
+    'const pages = {',
+    ...pageLines,
+    '}',
+    'const load = pages[config.pageId]',
+    'if (load) {',
+    '  load().then((mod) => {',
+    '    const Page = mod.default',
+    '    const metadata = mod.metadata || {}',
+    '    function PageShell (props) {',
+    "      return createElement('html', { lang: props.defaultLanguage || 'en' },",
+    "        createElement('head', null,",
+    "          createElement('meta', { charSet: 'utf-8' }),",
+    "          createElement('title', null, metadata.title || ''),",
+    '        ),',
+    '        createElement(App, props,',
+    '          createElement(Page, props)',
+    '        )',
+    '      )',
+    '    }',
+    '    hydrateRoot(document, createElement(PageShell, config))',
+    '  })',
+    '}',
+    '',
+  ].join('\n')
+}
+
+function generateSsrEntry ({ pageFiles, srcDir, stubAbsPath }) {
+  const seenIds = new Set()
+  const pagesLiteral = []
+  const pageModuleLines = []
+  for (const f of pageFiles) {
+    const { id, path: routePath } = pageRouteFromSource(f, srcDir)
+    if (seenIds.has(id)) {
+      throw new Error(`[@ossy/app] Duplicate page id "${id}" (${f}). Pages need unique ids.`)
+    }
+    seenIds.add(id)
+    const rel = relToGeneratedImport(stubAbsPath, f)
+    pagesLiteral.push(`  { id: ${JSON.stringify(id)}, path: ${JSON.stringify(routePath)} },`)
+    pageModuleLines.push(`  ${JSON.stringify(id)}: () => import('./${rel}'),`)
+  }
+  return [
+    '// Generated by @ossy/app — do not edit',
+    "import { createElement } from 'react'",
+    "import { renderToPipeableStream } from 'react-dom/server'",
+    "import { Writable } from 'node:stream'",
+    "import { App } from '@ossy/connected-components'",
+    'export const pages = [',
+    ...pagesLiteral,
+    ']',
+    'const pageModules = {',
+    ...pageModuleLines,
+    '}',
+    'function PageShell (props) {',
+    '  const meta = props._pageMeta || {}',
+    "  return createElement('html', { lang: props.defaultLanguage || 'en' },",
+    "    createElement('head', null,",
+    "      createElement('meta', { charSet: 'utf-8' }),",
+    "      createElement('title', null, meta.title || ''),",
+    '    ),',
+    '    createElement(App, props,',
+    '      createElement(props._pageComponent, props)',
+    '    )',
+    '  )',
+    '}',
+    'export async function renderPage (pageId, props) {',
+    '  const load = pageModules[pageId]',
+    '  if (!load) throw new Error(`[@ossy/app] Unknown page id: ${pageId}`)',
+    '  const mod = await load()',
+    '  const merged = { ...props, _pageComponent: mod.default, _pageMeta: mod.metadata || {} }',
+    '  return new Promise((resolve, reject) => {',
+    "    let html = ''",
+    '    const writable = new Writable({',
+    '      write (chunk, _enc, cb) { html += chunk.toString(); cb() },',
+    '    })',
+    '    const { pipe } = renderToPipeableStream(createElement(PageShell, merged), {',
+    '      onAllReady () { pipe(writable) },',
+    '      onError (err) { reject(err) },',
+    '    })',
+    "    writable.on('finish', () => resolve(html))",
+    '  })',
+    '}',
+    '',
+  ].join('\n')
+}
+
+export async function build (cliArgs = []) {
+
+  const options = arg({
+    '--config': String,
+    '-c': '--config',
+  }, { argv: cliArgs })
+
+  const cwd = process.cwd()
+  const buildPath = path.resolve(cwd, 'build')
+  const ossyDir = path.join(buildPath, OSSY_GEN_DIRNAME)
+  const srcDir = path.resolve(cwd, 'src')
+  const publicDir = path.resolve(cwd, 'public')
+  const configPath = path.resolve(cwd, options['--config'] || 'src/config.js')
+  const middlewarePath = fs.existsSync(path.resolve(cwd, 'src/middleware.js')) ? path.resolve(cwd, 'src/middleware.js') : null
+
+  resetBuildDir(buildPath)
+
+  const pageFiles = discoverFilesByPattern(srcDir, PAGE_FILE_PATTERN)
+  const apiFiles = discoverFilesByPattern(srcDir, API_FILE_PATTERN)
+  const taskFiles = discoverFilesByPattern(srcDir, TASK_FILE_PATTERN)
+  const resourceTemplatesFiles = discoverFilesByPattern(srcDir, TASK_FILE_PATTERN)
+
+ const entries = [
+  ...(middlewarePath ? [middlewarePath] : []),
+  ...(configPath ? [configPath] : []),
+  ...pageFiles,
+  ...apiFiles,
+  ...taskFiles,
+  ...resourceTemplatesFiles,
+ ]
+
+ fs.mkdirSync(path.dirname(path.join(ossyDir, OSSY_GEN_ENTRIES_BASENAME)), { recursive: true })
+ fs.writeFileSync(path.join(ossyDir, OSSY_GEN_ENTRIES_BASENAME), `${JSON.stringify(entries, null, 2)}\n`, 'utf8')
+
+
+}

package/cli/getPlatformFiles.task.js

@@ -0,0 +1,51 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import url from 'node:url'
+
+export const PAGE_FILE_PATTERN = /\.page\.(jsx?|tsx?)$/
+export const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
+export const TASK_FILE_PATTERN = /\.task\.(mjs|cjs|js)$/
+export const RESOURCE_TEMPLATE_FILE_PATTERN = /\.resource\.(mjs|cjs|js)$/
+
+function discoverFilesByPattern (srcDir, filePattern) {
+  const dir = path.resolve(srcDir)
+  if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
+    return []
+  }
+  const files = []
+  const walk = (d) => {
+    const entries = fs.readdirSync(d, { withFileTypes: true })
+    for (const e of entries) {
+      const full = path.join(d, e.name)
+      if (e.isDirectory()) walk(full)
+      else if (filePattern.test(e.name)) files.push(full)
+    }
+  }
+  walk(dir)
+  return files
+}
+
+
+export default async function getPlatformFiles(_folder) {
+  const cwd = process.cwd()
+  const folder = path.resolve(cwd, _folder)
+
+  const configPath = fs.existsSync(path.resolve(folder, 'config.js')) ? path.resolve(folder, 'config.js') : null
+  const middlewarePath = fs.existsSync(path.resolve(folder, 'middleware.js')) ? path.resolve(folder, 'middleware.js') : null
+
+  const pageFiles = discoverFilesByPattern(folder, PAGE_FILE_PATTERN)
+  const apiFiles = discoverFilesByPattern(folder, API_FILE_PATTERN)
+  const taskFiles = discoverFilesByPattern(folder, TASK_FILE_PATTERN)
+  const resourceTemplatesFiles = discoverFilesByPattern(folder, TASK_FILE_PATTERN)
+
+ const entries = [
+  ...(middlewarePath ? [middlewarePath] : []),
+  ...(configPath ? [configPath] : []),
+  ...pageFiles,
+  ...apiFiles,
+  ...taskFiles,
+  ...resourceTemplatesFiles,
+ ]
+
+ return entries
+}

package/cli/index.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-import { build } from './build.js'
+import { build } from './build.task.js'
+import { start } from './start.task.js'
 
 const [,, command, ...restArgs] = process.argv
 
 if (!command) {
   console.error(
-    '[@ossy/app] No command provided. Usage: app build'
+    '[@ossy/app] No command provided. Usage: app <build|start>'
   )
   process.exit(1)
 }
@@ -15,6 +16,10 @@ const run = async () => {
     await build(restArgs)
     return
   }
+  if (command === 'start') {
+    await start(restArgs)
+    return
+  }
   console.error(`[@ossy/app] Unknown command: ${command}`)
   process.exit(1)
 }

package/cli/start.task.js

@@ -0,0 +1,19 @@
+import path from 'node:path'
+import arg from 'arg'
+import { startServer } from '@ossy/platform/server'
+
+export async function start (cliArgs = []) {
+  const options = arg({
+    '--port': Number,
+    '-p': '--port',
+    '--build-dir': String,
+    '--cwd': String,
+  }, { argv: cliArgs })
+
+  const cwd = options['--cwd'] ? path.resolve(options['--cwd']) : process.cwd()
+  const buildDir = options['--build-dir'] || 'build'
+  const port = options['--port']
+
+  const { lifetime } = await startServer({ cwd, buildDir, port })
+  await lifetime
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -27,15 +27,15 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.15.0",
-    "@ossy/design-system": "^1.15.0",
-    "@ossy/pages": "^1.15.0",
-    "@ossy/platform": "^1.14.0",
-    "@ossy/router": "^1.15.0",
-    "@ossy/router-react": "^1.15.0",
-    "@ossy/sdk": "^1.15.0",
-    "@ossy/sdk-react": "^1.15.0",
-    "@ossy/themes": "^1.15.0",
+    "@ossy/connected-components": "^1.15.2",
+    "@ossy/design-system": "^1.15.2",
+    "@ossy/pages": "^1.15.2",
+    "@ossy/platform": "^1.14.2",
+    "@ossy/router": "^1.15.2",
+    "@ossy/router-react": "^1.15.2",
+    "@ossy/sdk": "^1.15.2",
+    "@ossy/sdk-react": "^1.15.2",
+    "@ossy/themes": "^1.15.2",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "6.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -68,5 +68,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "6a7aac8937521487dc9a032a8fe71f02f2a86367"
+  "gitHead": "6a15f3ac4cafdb190beed11e4a93adc0ba28c245"
 }

package/src/index.js

@@ -3,4 +3,4 @@ export {
   writeResourceTemplatesBarrelIfPresent,
   resourceTemplatesDir,
   OSSY_RESOURCE_TEMPLATES_OUT,
-} from '../cli/build.js'
+} from '../cli/build.task.js'

package/cli/Middleware.js

@@ -1,3 +0,0 @@
-// dummy file so it can be imported
-
-export default undefined