spyne-cli 0.7.0 → 0.7.2

package/README.md

@@ -61,8 +61,8 @@ npx spyne-cli create-app my-app --template shell
 
 | Template | Contents |
 | --- | --- |
-| `starter` (default) | `app.js` and a hello-world view |
-| `shell` | pages, navigation, and UI components |
+| `shell` (default) | pages, navigation, and UI components |
+| `starter` | `app.js` and a hello-world view |
 
 Options: `-t, --template`, `--no-install` to skip dependency installation,
 `--no-git` to skip git initialisation.

package/index.js

@@ -16,6 +16,7 @@ import {
   renderError,
   renderHelp,
   renderModuleResult,
+  sitePromptPrompt,
   templatePrompt,
 } from './src/cli/render.js';
 
@@ -129,6 +130,13 @@ async function resolveAppArgs() {
     ({template: args.template} = await prompt(templatePrompt()));
   }
 
+  // Shell's default follow-up: a site description sends scaffolding through
+  // the AI generator; an empty answer keeps the blank shell.
+  if (args.template === 'shell' && !provided.has('prompt')) {
+    const {prompt: sitePrompt} = await prompt(sitePromptPrompt());
+    if (String(sitePrompt).trim()) args.prompt = sitePrompt;
+  }
+
   if (!args.appName) {
     ({appName: args.appName} = await prompt(appNamePrompt()));
   }

package/package.json

@@ -4,7 +4,13 @@
     "spyne-cli": "index.js"
   },
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.7.2",
+  "overrides": {
+    "mocha": {
+      "diff": "^8.0.3",
+      "serialize-javascript": "^7.0.5"
+    }
+  },
   "description": "Generates spyne objects and saves them to standard spyne.",
   "main": "src/registry.js",
   "engines": {
@@ -51,6 +57,7 @@
     "change-case": "^5.4.4",
     "clear": "^0.1.0",
     "enquirer": "^2.4.1",
+    "fflate": "^0.8.3",
     "figlet": "^1.8.0",
     "json-stringify-safe": "^5.0.1",
     "ora": "^8.1.1",

package/src/cli/render.js

@@ -34,7 +34,9 @@ export const renderAppResult = (result) => {
     '',
     c.greenBright('Success!'),
     `Created ${c.bold(result.appName)} at ${result.path}`,
-    `Template: ${result.template}`,
+    result.generated
+        ? `Template: ${result.template} (AI-generated, app id ${result.appId})`
+        : `Template: ${result.template}`,
     '',
     'Next steps:',
     ...result.nextSteps.map((step) => `  ${c.cyan(step)}`),
@@ -88,6 +90,18 @@ export const appNamePrompt = () => ({
       'An app name is required.',
 });
 
+// The default follow-up when the shell template is chosen: describing the
+// site routes scaffolding through the AI generator; Enter on an empty line
+// keeps the blank shell clone.
+export const sitePromptPrompt = () => ({
+  type: 'input',
+  name: 'prompt',
+  message: c.blueBright(
+      'Describe your site — AI generates its pages and content ' +
+      '(Enter to skip for the blank shell)'),
+  initial: '',
+});
+
 export const createProgressReporter = () => {
   let spinner;
   return ({status, message}) => {

package/src/core/create-app.js

@@ -5,22 +5,23 @@ import fs from 'fs';
 import path from 'path';
 import {spawn} from 'child_process';
 import simpleGit from 'simple-git';
+import {fetchGeneratedApp} from './generate-app.js';
 
 // Template keys mirror the distinguishing suffix of their repo names:
 // spynejs/application-starter and spynejs/application-shell.
 export const TEMPLATES = {
-  starter: {
-    value: 'starter',
-    label: 'Application Starter',
-    description: 'minimal: app.js + a hello-world view',
-    repo: 'https://github.com/spynejs/application-starter.git',
-  },
   shell: {
     value: 'shell',
     label: 'Application Shell',
     description: 'pages, navigation, and UI components built in',
     repo: 'https://github.com/spynejs/application-shell.git',
   },
+  starter: {
+    value: 'starter',
+    label: 'Application Starter',
+    description: 'minimal: app.js + a hello-world view',
+    repo: 'https://github.com/spynejs/application-starter.git',
+  },
 };
 
 // Accepted silently; only the canonical values are documented.
@@ -30,7 +31,7 @@ const TEMPLATE_ALIASES = {
   'application-starter': 'starter',
 };
 
-export const DEFAULT_TEMPLATE = 'starter';
+export const DEFAULT_TEMPLATE = 'shell';
 
 export const resolveTemplate = (name) => {
   if (!name) return DEFAULT_TEMPLATE;
@@ -163,26 +164,46 @@ export async function createApp(args = {}) {
     };
   }
 
-  const repo = repoFor(templateKey);
-
-  onProgress({step: 'clone', status: 'start', message: 'Cloning template...'});
-  try {
-    await simpleGit().clone(repo, targetDir,
-        ['--branch=main', '--single-branch', '--depth=1']);
-    onProgress({step: 'clone', status: 'success', message: 'Template cloned.'});
-  } catch (err) {
-    onProgress({step: 'clone', status: 'fail', message: 'Clone failed.'});
+  // A site description routes the shell template through the AI generator
+  // instead of a plain clone; everything after acquisition is shared.
+  const sitePrompt = args.prompt && String(args.prompt).trim();
+  if (sitePrompt && templateKey !== 'shell') {
     return {
       ok: false,
       error: {
-        code: 'CLONE_FAILED',
-        message: `Could not clone ${repo}: ${err.message}`,
+        code: 'PROMPT_UNSUPPORTED',
+        message: 'A site description generates from the shell template. ' +
+            'Use --template shell (or drop --prompt).',
       },
     };
   }
 
-  // No .git leakage from the template repo.
-  fs.rmSync(path.join(targetDir, '.git'), {recursive: true, force: true});
+  const repo = repoFor(templateKey);
+  let generated;
+
+  if (sitePrompt) {
+    generated = await fetchGeneratedApp({sitePrompt, targetDir, onProgress});
+    if (!generated.ok) return generated;
+  } else {
+    onProgress({step: 'clone', status: 'start', message: 'Cloning template...'});
+    try {
+      await simpleGit().clone(repo, targetDir,
+          ['--branch=main', '--single-branch', '--depth=1']);
+      onProgress({step: 'clone', status: 'success', message: 'Template cloned.'});
+    } catch (err) {
+      onProgress({step: 'clone', status: 'fail', message: 'Clone failed.'});
+      return {
+        ok: false,
+        error: {
+          code: 'CLONE_FAILED',
+          message: `Could not clone ${repo}: ${err.message}`,
+        },
+      };
+    }
+
+    // No .git leakage from the template repo.
+    fs.rmSync(path.join(targetDir, '.git'), {recursive: true, force: true});
+  }
 
   applyProjectIdentity(targetDir, appName);
 
@@ -220,13 +241,16 @@ export async function createApp(args = {}) {
     appName,
     path: targetDir,
     template: templateKey,
-    templateRepo: repo,
+    ...(generated
+        ? {generated: true, appId: generated.appId}
+        : {templateRepo: repo}),
     gitInitialized,
     dependenciesInstalled,
     nextSteps: [
       `cd ${appName}`,
       ...(dependenciesInstalled ? [] : ['npm install']),
       'npm start',
+      ...(generated ? ['see GETTING-STARTED.md for the CMS + AI editing'] : []),
     ],
   };
 }

package/src/core/generate-app.js

@@ -0,0 +1,161 @@
+// AI-generated app scaffolding: the shell template, but with pages, routes,
+// content, and images produced by the SpyneJS generator service from one
+// site description. Same contract as the clone path — no terminal output,
+// progress via callback, structured result.
+
+import fs from 'fs';
+import path from 'path';
+import {unzipSync} from 'fflate';
+
+/**
+ * Endpoint for the generator service (POST /generate). Env override mirrors
+ * the template-repo override pattern; read at call time.
+ */
+export const DEFAULT_GENERATOR_URL =
+    'https://ntvylgarzwinj3lcwtyctwlclu0ldpjp.lambda-url.us-east-1.on.aws/';
+
+export const generatorUrl = () =>
+    process.env.SPYNE_CLI_GENERATOR_URL || DEFAULT_GENERATOR_URL;
+
+const errorFor = (status, body) => {
+  if (status === 422) {
+    return {
+      code: 'GENERATION_INVALID',
+      message: 'The generator could not produce a valid site from that ' +
+          'description. Try rephrasing it.',
+    };
+  }
+  if (status === 429) {
+    return {
+      code: 'RATE_LIMITED',
+      message: 'The anonymous generation quota for this network was reached. ' +
+          'Try again later.',
+    };
+  }
+  if (status === 503 || status === 504) {
+    return {
+      code: 'GENERATION_TIMEOUT',
+      message: 'The generator took too long to respond. Try again — complex ' +
+          'descriptions occasionally need a second attempt.',
+    };
+  }
+  return {
+    code: 'GENERATION_FAILED',
+    message: `Generator request failed (${status}): ` +
+        `${(body && body.error) || 'unexpected response'}.`,
+  };
+};
+
+/**
+ * Extract a generated package zip into targetDir, stripping the single
+ * top-level directory the package wraps its files in. Entries that would
+ * escape targetDir are rejected.
+ */
+export const extractPackage = (zipBuffer, targetDir) => {
+  const entries = unzipSync(new Uint8Array(zipBuffer));
+  const resolvedTarget = path.resolve(targetDir);
+
+  for (const [entryPath, data] of Object.entries(entries)) {
+    if (entryPath.endsWith('/')) continue;
+    const stripped = entryPath.split('/').slice(1).join('/');
+    if (!stripped) continue;
+    const dest = path.resolve(resolvedTarget, stripped);
+    if (!dest.startsWith(resolvedTarget + path.sep)) {
+      throw new Error(`Unsafe path in package: ${entryPath}`);
+    }
+    fs.mkdirSync(path.dirname(dest), {recursive: true});
+    fs.writeFileSync(dest, data);
+  }
+};
+
+/**
+ * Generate an application from a site description. Called by createApp once
+ * appName/targetDir are validated; performs the network stages and extraction,
+ * leaving identity, git, and install to the shared pipeline.
+ *
+ * @returns {Promise<Object>} {ok, ...} — on success includes appId and
+ *     claimToken so renderers can surface the CMS claim.
+ */
+export async function fetchGeneratedApp({sitePrompt, targetDir, onProgress}) {
+  onProgress({
+    step: 'generate',
+    status: 'start',
+    message: 'Generating site with AI (this can take up to a minute)...',
+  });
+
+  let res;
+  let body;
+  try {
+    res = await fetch(generatorUrl(), {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        // Private testing bypass for the anonymous quota (optional).
+        ...(process.env.SPYNE_CLI_GENERATOR_KEY
+            ? {'x-generation-key': process.env.SPYNE_CLI_GENERATOR_KEY}
+            : {}),
+      },
+      body: JSON.stringify({prompt: sitePrompt}),
+      signal: AbortSignal.timeout(120000),
+    });
+    body = await res.json().catch(() => ({}));
+  } catch (err) {
+    onProgress({step: 'generate', status: 'fail', message: 'Generation failed.'});
+    return {
+      ok: false,
+      error: {
+        code: 'GENERATION_UNREACHABLE',
+        message: `Could not reach the generator: ${err.message}`,
+      },
+    };
+  }
+
+  if (!res.ok || !body.packageUrl) {
+    onProgress({step: 'generate', status: 'fail', message: 'Generation failed.'});
+    return {ok: false, error: errorFor(res.status, body)};
+  }
+
+  const pageCount = Array.isArray(body.appModel && body.appModel.content)
+      ? body.appModel.content.length
+      : undefined;
+  onProgress({
+    step: 'generate',
+    status: 'success',
+    message: pageCount
+        ? `Site generated (${pageCount} pages).`
+        : 'Site generated.',
+  });
+
+  onProgress({step: 'download', status: 'start', message: 'Downloading package...'});
+  let zipBuffer;
+  try {
+    const zipRes = await fetch(body.packageUrl,
+        {signal: AbortSignal.timeout(120000)});
+    if (!zipRes.ok) throw new Error(`HTTP ${zipRes.status}`);
+    zipBuffer = Buffer.from(await zipRes.arrayBuffer());
+  } catch (err) {
+    onProgress({step: 'download', status: 'fail', message: 'Download failed.'});
+    return {
+      ok: false,
+      error: {
+        code: 'DOWNLOAD_FAILED',
+        message: `Could not download the package: ${err.message}`,
+      },
+    };
+  }
+  onProgress({step: 'download', status: 'success', message: 'Package downloaded.'});
+
+  try {
+    extractPackage(zipBuffer, targetDir);
+  } catch (err) {
+    return {
+      ok: false,
+      error: {
+        code: 'EXTRACT_FAILED',
+        message: `Could not extract the package: ${err.message}`,
+      },
+    };
+  }
+
+  return {ok: true, appId: body.appId, claimToken: body.claimToken};
+}

package/src/registry.js

@@ -59,6 +59,12 @@ export const commands = [
         default: DEFAULT_TEMPLATE,
         description: 'Template to scaffold from.',
       },
+      prompt: {
+        type: 'string',
+        alias: 'p',
+        description: 'Site description — AI generates pages, routes, content, ' +
+            'and images (shell template only).',
+      },
       install: {
         type: 'boolean',
         default: true,
@@ -131,7 +137,7 @@ export const commands = [
 
 // `new` shipped in 0.6.x and stays working; create-app is canonical.
 export const aliases = {
-  new: {command: 'create-app', deprecated: true, since: '0.7.0'},
+  new: {command: 'create-app', deprecated: true, since: '0.7.2'},
 };
 
 /**
@@ -140,7 +146,7 @@ export const aliases = {
  */
 export const removedFlags = {
   spa: {
-    removedIn: '0.7.0',
+    removedIn: '0.7.1',
     message: '"--spa" has been removed. Pick a template with --template starter|shell.',
   },
 };