@ossy/app 1.21.4 → 1.22.1

package/cli/build.task.js

@@ -54,14 +54,21 @@ function ensureDir (dir) {
 // folders (e.g. `apps/home.page.jsx` and `analytics/home.page.jsx`) from
 // colliding on the Rollup input map — which the filesystem already
 // guarantees can't happen at the relative-path level.
-function entryNameFromSource (sourcePath, srcDir) {
+//
+// For installed-package entries, `packageName` is provided and used as a
+// prefix so that e.g. `@ossy/authentication/sign-in.page.jsx` becomes
+// `ossy__authentication__sign-in.page` and never collides with a local file.
+function entryNameFromSource (sourcePath, srcDir, packageName) {
   const rel = path.relative(srcDir, sourcePath).replace(/\\/g, '/')
-  return rel.replace(/\//g, '__').replace(/\.(jsx?|tsx?|mjs|cjs)$/, '')
+  const flat = rel.replace(/\//g, '__').replace(/\.(jsx?|tsx?|mjs|cjs)$/, '')
+  if (!packageName) return flat
+  const pkgPrefix = packageName.replace(/^@/, '').replace(/\//g, '__').replace(/[^a-zA-Z0-9_-]/g, '_')
+  return `${pkgPrefix}__${flat}`
 }
 
-function stubFileNameFor (kind, sourcePath, srcDir) {
+function stubFileNameFor (kind, sourcePath, srcDir, packageName) {
   const ext = kind === 'page' ? '.entry.jsx' : '.entry.js'
-  return entryNameFromSource(sourcePath, srcDir) + ext
+  return entryNameFromSource(sourcePath, srcDir, packageName) + ext
 }
 
 function relImport (fromAbs, toAbs) {
@@ -176,12 +183,13 @@ export async function build (cliArgs = []) {
   const stubInputMap = {}
 
   for (const entry of allEntries) {
-    const { kind, sourcePath } = entry
-    const inputName = entryNameFromSource(sourcePath, srcDir)
-    const stubAbs = path.join(stubDir, stubFileNameFor(kind, sourcePath, srcDir))
+    const { kind, sourcePath, packageName, packageSrcDir } = entry
+    const effectiveSrcDir = packageSrcDir || srcDir
+    const inputName = entryNameFromSource(sourcePath, effectiveSrcDir, packageName)
+    const stubAbs = path.join(stubDir, stubFileNameFor(kind, sourcePath, effectiveSrcDir, packageName))
     fs.writeFileSync(stubAbs, stubFor(kind, { stubAbs, sourceAbs: sourcePath }), 'utf8')
     stubInputMap[inputName] = stubAbs
-    entriesByStub.set(stubAbs, { kind, sourcePath })
+    entriesByStub.set(stubAbs, { kind, sourcePath, packageName, packageSrcDir })
   }
 
   const configPath = path.resolve(srcDir, 'config.js')

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

@@ -10,8 +10,10 @@ export const RESOURCE_FILE_PATTERN = /\.resource\.(mjs|cjs|js)$/
  * @typedef {'page' | 'api' | 'task' | 'resource'} EntryKind
  *
  * @typedef {object} PlatformEntry
- * @property {EntryKind} kind     Which bucket this entry lives in.
- * @property {string} sourcePath  Absolute path to the user-authored source file.
+ * @property {EntryKind} kind          Which bucket this entry lives in.
+ * @property {string} sourcePath       Absolute path to the user-authored source file.
+ * @property {string} [packageName]    npm package name, set only for installed-package entries.
+ * @property {string} [packageSrcDir]  Absolute path to the package's `src/` dir, set only for installed-package entries.
  *
  * @typedef {object} PlatformFiles
  * @property {PlatformEntry[]} pages      Discovered `*.page.{jsx,tsx,...}` entries.
@@ -76,11 +78,72 @@ export function filePathToRoute (absPath, srcDir) {
   return { id, path: defaultPageRoute(id) }
 }
 
+/**
+ * Walks `node_modules/` in `projectRoot` looking for packages that declare an
+ * `"ossy": { "src": "./src" }` field in their `package.json`. Returns entries
+ * from those packages' source trees, tagged with `packageName` and
+ * `packageSrcDir` so the build pipeline can namespace them correctly.
+ *
+ * Handles both flat packages (`node_modules/foo`) and scoped packages
+ * (`node_modules/@scope/foo`).
+ *
+ * @param {string} projectRoot Absolute path to the consuming project root (parent of `src/`).
+ * @returns {PlatformEntry[]}
+ */
+export function discoverInstalledPackageEntries (projectRoot) {
+  const nmDir = path.join(projectRoot, 'node_modules')
+  if (!fs.existsSync(nmDir) || !fs.statSync(nmDir).isDirectory()) return []
+
+  const entries = []
+
+  const tryPackageDir = (pkgDir) => {
+    const pkgJsonPath = path.join(pkgDir, 'package.json')
+    if (!fs.existsSync(pkgJsonPath)) return
+    let pkg
+    try { pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8')) } catch { return }
+    if (!pkg.ossy?.src) return
+
+    const packageSrcDir = path.resolve(pkgDir, pkg.ossy.src)
+    const files = [
+      ...discoverFilesByPattern(packageSrcDir, PAGE_FILE_PATTERN),
+      ...discoverFilesByPattern(packageSrcDir, API_FILE_PATTERN),
+      ...discoverFilesByPattern(packageSrcDir, TASK_FILE_PATTERN),
+      ...discoverFilesByPattern(packageSrcDir, RESOURCE_FILE_PATTERN),
+    ]
+    for (const sourcePath of files) {
+      const stat = fs.statSync(sourcePath)
+      if (!stat.isFile() || stat.size === 0) continue
+      const kind = classifyFile(sourcePath)
+      if (!kind) continue
+      entries.push({ kind, sourcePath, packageName: pkg.name, packageSrcDir })
+    }
+  }
+
+  for (const entry of fs.readdirSync(nmDir, { withFileTypes: true })) {
+    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue
+    if (entry.name.startsWith('@')) {
+      const scopeDir = path.join(nmDir, entry.name)
+      for (const scoped of fs.readdirSync(scopeDir, { withFileTypes: true })) {
+        if (scoped.isDirectory() || scoped.isSymbolicLink()) {
+          tryPackageDir(path.join(scopeDir, scoped.name))
+        }
+      }
+    } else {
+      tryPackageDir(path.join(nmDir, entry.name))
+    }
+  }
+
+  return entries
+}
+
 /**
  * Walks `srcDir` and returns the user-authored entries the platform cares
  * about, bucketed by kind. Empty (zero-byte) source files are skipped — we
  * treat them as placeholders the user is mid-creating.
  *
+ * Also scans installed npm packages that declare an `"ossy": { "src" }` field
+ * in their `package.json`, merging their entries into the same output buckets.
+ *
  * Metadata isn't read here on purpose: the build pipeline reads it from the
  * bundled output instead, which lets users compute `metadata.path` (and
  * anything else) from imports, config, env vars, etc.
@@ -90,19 +153,27 @@ export function filePathToRoute (absPath, srcDir) {
  */
 export default async function getPlatformFiles (srcDir) {
   const out = { pages: [], apis: [], tasks: [], resources: [] }
-  const all = [
+  const bucketByKind = { page: 'pages', api: 'apis', task: 'tasks', resource: 'resources' }
+
+  const localFiles = [
     ...discoverFilesByPattern(srcDir, PAGE_FILE_PATTERN),
     ...discoverFilesByPattern(srcDir, API_FILE_PATTERN),
     ...discoverFilesByPattern(srcDir, TASK_FILE_PATTERN),
     ...discoverFilesByPattern(srcDir, RESOURCE_FILE_PATTERN),
   ]
-  const bucketByKind = { page: 'pages', api: 'apis', task: 'tasks', resource: 'resources' }
-  for (const sourcePath of all) {
+  for (const sourcePath of localFiles) {
     const stat = fs.statSync(sourcePath)
     if (!stat.isFile() || stat.size === 0) continue
     const kind = classifyFile(sourcePath)
     if (!kind) continue
     out[bucketByKind[kind]].push({ kind, sourcePath })
   }
+
+  const projectRoot = path.dirname(srcDir)
+  const packageEntries = discoverInstalledPackageEntries(projectRoot)
+  for (const entry of packageEntries) {
+    out[bucketByKind[entry.kind]].push(entry)
+  }
+
   return out
 }

package/cli/manifest-plugin.js

@@ -138,7 +138,7 @@ export function manifestPlugin ({ entriesByStub, srcDir, staticOutDir, configVal
         }
 
         const rawMeta = (mod && mod.metadata) || {}
-        const id = rawMeta.id || metadataIdFromFile(entryInfo.sourcePath, srcDir)
+        const id = rawMeta.id || metadataIdFromFile(entryInfo.sourcePath, entryInfo.packageSrcDir || srcDir)
         if (!id) {
           this.error(`[@ossy/app][build] ${entryInfo.kind} entry missing metadata.id: ${entryInfo.sourcePath}`)
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.21.4",
+  "version": "1.22.1",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@jest/globals": "^30.2.0",
     "jest": "^30.2.0",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3"
   },
   "dependencies": {
     "@babel/cli": "^7.26.4",
@@ -33,17 +33,17 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.21.4",
-    "@ossy/design-system": "^1.21.4",
-    "@ossy/pages": "^1.21.4",
-    "@ossy/platform": "^1.20.4",
-    "@ossy/router": "^1.21.4",
-    "@ossy/router-react": "^1.21.4",
-    "@ossy/sdk": "^1.21.4",
-    "@ossy/sdk-react": "^1.21.4",
-    "@ossy/themes": "^1.21.4",
+    "@ossy/connected-components": "^1.22.1",
+    "@ossy/design-system": "^1.22.1",
+    "@ossy/pages": "^1.22.1",
+    "@ossy/platform": "^1.21.1",
+    "@ossy/router": "^1.22.1",
+    "@ossy/router-react": "^1.22.1",
+    "@ossy/sdk": "^1.22.1",
+    "@ossy/sdk-react": "^1.22.1",
+    "@ossy/themes": "^1.22.1",
     "@rollup/plugin-alias": "^6.0.0",
-    "@rollup/plugin-babel": "6.1.0",
+    "@rollup/plugin-babel": "^7.0.0",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-inject": "^5.0.5",
     "@rollup/plugin-json": "^6.1.0",
@@ -61,7 +61,7 @@
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-delete": "^3.0.2",
     "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-node-externals": "^8.1.2",
+    "rollup-plugin-node-externals": "^9.0.1",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-plugin-postcss-modules": "^2.1.1",
     "rollup-plugin-preserve-directives": "^0.4.0",
@@ -75,5 +75,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "296ec9d1c354589c223e533b230535d2b4e6db84"
+  "gitHead": "8e757fb891965b78be752b9c7db72cf45470144d"
 }