runcloud 0.2.172 → 0.2.174

package/dist/commands/appStoreEvaluate.js

@@ -303,12 +303,10 @@ function evaluateDuplicateRoutes(root, item) {
         return makeItem(item, 'pass', 'No Expo Router app directory found.', 'scan: app/ directory absent');
     const routes = new Map();
     for (const file of walkFiles(appDir)) {
-        if (!/\.(tsx|ts|jsx|js)$/.test(file) || /(^|\/)_layout\.(tsx|ts|jsx|js)$/.test(toRel(root, file)))
+        if (!/\.(tsx|ts|jsx|js)$/.test(file))
             continue;
-        const route = routePath(appDir, file);
-        const current = routes.get(route) ?? [];
-        current.push(toRel(root, file));
-        routes.set(route, current);
+        for (const route of routeKeys(appDir, file))
+            routes.set(route, [...(routes.get(route) ?? []), toRel(root, file)]);
     }
     const duplicates = [...routes.entries()].filter(([, files]) => files.length > 1);
     if (!duplicates.length)
@@ -571,12 +569,15 @@ function routerDir(root) {
     const src = path.join(root, 'src', 'app');
     return safeStat(src)?.isDirectory() ? src : path.join(root, 'app');
 }
-function routePath(appDir, file) {
-    const rel = toRel(appDir, file).replace(/\.(tsx|ts|jsx|js)$/, '');
-    const parts = rel.split('/').filter((part) => part && !/^\(.+\)$/.test(part));
-    if (parts[parts.length - 1] === 'index')
-        parts.pop();
-    return `/${parts.join('/')}`;
+function routeKeys(appDir, file) {
+    let keys = [''];
+    for (const part of toRel(appDir, file).replace(/\.(tsx|ts|jsx|js)$/, '').split('/')) {
+        let options = /^\(.+,.+\)$/.test(part) ? part.slice(1, -1).split(',').map((group) => `(${group})`) : [part];
+        if (keys.length * options.length > 64)
+            options = [part];
+        keys = keys.flatMap((key) => options.map((option) => `${key}/${option}`));
+    }
+    return keys;
 }
 function evidence(matches) {
     return matches.slice(0, 5).map((match) => `${match.file}:${match.line}: ${match.text}`).join('\n');

package/dist/deploy-bundle.js

@@ -6,6 +6,7 @@ import { join } from 'node:path';
 import { Buffer } from 'node:buffer';
 import { create as tarCreate } from 'tar';
 import { readProjectLink } from './config.js';
+import { wranglerConfigProblem } from './wrangler-config-check.js';
 export const NEWLY_BACKEND_DEPLOY_BUNDLE_CONTENT_TYPE = 'application/vnd.newly.deploy-bundle+gzip';
 export const NEWLY_BACKEND_DEPLOY_MODE_BUNDLE = 'bundle';
 const MANIFEST_PATH = 'newly-deploy.json';
@@ -20,6 +21,13 @@ export class DeployBuildError extends Error {
 }
 export async function buildDeployBundle(options) {
     const { projectId, projectDir, services, run, log } = options;
+    for (const service of services) {
+        const configPath = join(projectDir, 'backend', service.path, 'wrangler.toml');
+        const problem = existsSync(configPath) ? wranglerConfigProblem(readFileSync(configPath, 'utf8')) : null;
+        if (problem) {
+            throw new DeployBuildError(`${service.name}/wrangler.toml: ${problem}. Newly Backend would reject this deploy; fix the file and deploy again.`);
+        }
+    }
     const bunVersion = await run('bun', ['--version'], projectDir);
     if (bunVersion.code !== 0) {
         throw new DeployBuildError('newly deploy needs bun on your PATH (https://bun.sh)');

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.2.172';
+export const CLI_VERSION = '0.2.174';

package/dist/wrangler-config-check.js

@@ -0,0 +1,46 @@
+import { parse } from 'smol-toml';
+export const UNSUPPORTED_WRANGLER_KEYS = [
+    'kv_namespaces',
+    'd1_databases',
+    'durable_objects',
+    'services',
+    'hyperdrive',
+    'ai',
+    'vectorize',
+    'browser',
+    'analytics_engine_datasets',
+    'assets',
+    'workflows',
+    'send_email',
+    'mtls_certificates',
+    'dispatch_namespaces',
+    'tail_consumers',
+];
+function isNonEmpty(value) {
+    if (value === undefined || value === null)
+        return false;
+    if (Array.isArray(value))
+        return value.length > 0;
+    if (typeof value === 'object')
+        return Object.keys(value).length > 0;
+    return true;
+}
+export function wranglerConfigProblem(configToml) {
+    let config;
+    try {
+        config = parse(configToml);
+    }
+    catch (error) {
+        return `wrangler.toml does not parse: ${error instanceof Error ? error.message : String(error)}`;
+    }
+    if (typeof config['compatibility_date'] !== 'string')
+        return 'compatibility_date must be a quoted string';
+    for (const key of UNSUPPORTED_WRANGLER_KEYS) {
+        if (isNonEmpty(config[key]))
+            return `${key} bindings are not supported for Newly Backend services`;
+    }
+    const triggers = (config['triggers'] ?? {});
+    if (isNonEmpty(triggers['crons']))
+        return 'cron triggers are not supported';
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcloud",
-  "version": "0.2.172",
+  "version": "0.2.174",
   "description": "Create and control run.cloud remote mobile simulators and cloud sandboxes",
   "license": "Apache-2.0",
   "keywords": [