@stacksjs/actions 0.72.97 → 0.72.99

package/dist/build/desktop.js

@@ -1,5 +1,5 @@
-import{createHash}from"node:crypto";import{chmodSync,copyFileSync,existsSync,mkdirSync,readFileSync,rmSync,writeFileSync}from"node:fs";import{join}from"node:path";import process from"node:process";import{log,runCommand}from"@stacksjs/cli";import{corePath,projectPath,storagePath}from"@stacksjs/path";import{assertDesktopReleaseChannel,resolveCraftExecutable,resolveDesktopLauncher}from"@stacksjs/desktop-build";const outputDir=storagePath("framework/desktop-dist"),launcherName=process.platform==="win32"?"stacks-desktop.exe":"stacks-desktop",runtimeName=process.platform==="win32"?"craft-runtime.exe":"craft-runtime",appUrl=process.env.DESKTOP_URL||process.env.APP_URL,releaseChannel=process.env.DESKTOP_RELEASE_CHANNEL==="stable"?"stable":"experimental",support=assertDesktopReleaseChannel(releaseChannel);if(!appUrl)throw Error("Desktop builds require APP_URL or DESKTOP_URL so the native app knows which Stacks application to open");const url=new URL(/^https?:\/\//.test(appUrl)?appUrl:`https://${appUrl}`),craftBinary=resolveCraftExecutable();if(readFileSync(craftBinary).subarray(0,2).toString()==="#!")throw Error(`CRAFT_BIN points at a script, not a native binary: ${craftBinary}. Point it at the compiled Craft executable (packages/zig/zig-out/bin/craft).`);if(existsSync(outputDir))rmSync(outputDir,{recursive:!0});mkdirSync(outputDir,{recursive:!0});const desktopSource=corePath("desktop");if(existsSync(join(desktopSource,"package.json"))&&existsSync(join(desktopSource,"src")))await runCommand("bun run build",{cwd:desktopSource});const launcherEntry=resolveDesktopLauncher();await runCommand(["bun","build","--compile",launcherEntry,"--outfile",join(outputDir,launcherName)],{cwd:projectPath()});copyFileSync(craftBinary,join(outputDir,runtimeName));if(process.platform!=="win32"){chmodSync(join(outputDir,launcherName),493);chmodSync(join(outputDir,runtimeName),493)}writeFileSync(join(outputDir,"desktop.json"),`${JSON.stringify({url:url.toString().replace(/\/$/,""),title:process.env.APP_NAME||"Stacks",width:1400,height:900,darkMode:!1,systemTray:!0,hideDockIcon:!1,releaseChannel,platform:process.platform,architecture:process.arch},null,2)}
+import{createHash}from"node:crypto";import{chmodSync,copyFileSync,existsSync,mkdirSync,readFileSync,rmSync,writeFileSync}from"node:fs";import{join}from"node:path";import process from"node:process";import{log,runCommand}from"@stacksjs/cli";import{corePath,projectPath,storagePath}from"@stacksjs/path";import{assertDesktopReleaseChannel,hasUserlandDesktopLauncher,resolveCraftExecutable,resolveDesktopLauncher}from"@stacksjs/desktop-build";const outputDir=storagePath("framework/desktop-dist"),launcherName=process.platform==="win32"?"stacks-desktop.exe":"stacks-desktop",runtimeName=process.platform==="win32"?"craft-runtime.exe":"craft-runtime",appUrl=process.env.DESKTOP_URL||process.env.APP_URL,releaseChannel=process.env.DESKTOP_RELEASE_CHANNEL==="stable"?"stable":"experimental",support=assertDesktopReleaseChannel(releaseChannel),ownsLauncher=hasUserlandDesktopLauncher(projectPath());if(!appUrl&&!ownsLauncher)throw Error("Desktop builds require APP_URL or DESKTOP_URL so the native app knows which Stacks application to open. An app that opens something local instead can supply its own app/Desktop/launcher.ts.");const url=appUrl?new URL(/^https?:\/\//.test(appUrl)?appUrl:`https://${appUrl}`):null,craftBinary=resolveCraftExecutable();if(readFileSync(craftBinary).subarray(0,2).toString()==="#!")throw Error(`CRAFT_BIN points at a script, not a native binary: ${craftBinary}. Point it at the compiled Craft executable (packages/zig/zig-out/bin/craft).`);if(existsSync(outputDir))rmSync(outputDir,{recursive:!0});mkdirSync(outputDir,{recursive:!0});const desktopSource=corePath("desktop");if(existsSync(join(desktopSource,"package.json"))&&existsSync(join(desktopSource,"src")))await runCommand("bun run build",{cwd:desktopSource});const launcherEntry=resolveDesktopLauncher(projectPath());await runCommand(["bun","build","--compile",launcherEntry,"--outfile",join(outputDir,launcherName)],{cwd:projectPath()});copyFileSync(craftBinary,join(outputDir,runtimeName));if(process.platform!=="win32"){chmodSync(join(outputDir,launcherName),493);chmodSync(join(outputDir,runtimeName),493)}writeFileSync(join(outputDir,"desktop.json"),`${JSON.stringify({url:url?url.toString().replace(/\/$/,""):"",title:process.env.APP_NAME||"Stacks",width:1400,height:900,darkMode:!1,systemTray:!0,hideDockIcon:!1,releaseChannel,platform:process.platform,architecture:process.arch,launcher:ownsLauncher?"userland":"framework"},null,2)}
 `);const gitResult=Bun.spawnSync(["git","rev-parse","HEAD"],{cwd:projectPath()});if(gitResult.exitCode!==0)throw Error("Desktop builds require an exact Git source revision");const sourceRevision=gitResult.stdout.toString().trim(),remoteResult=Bun.spawnSync(["git","remote","get-url","origin"],{cwd:projectPath()}),sourceRepository=remoteResult.exitCode===0?remoteResult.stdout.toString().trim().replace(/\.git$/,""):"unknown",artifacts=[launcherName,runtimeName,"desktop.json"].map((name)=>{const contents=readFileSync(join(outputDir,name));return{name,bytes:contents.byteLength,sha256:createHash("sha256").update(contents).digest("hex")}});writeFileSync(join(outputDir,"provenance.json"),`${JSON.stringify({schemaVersion:"1.0.0",sourceRepository,sourceRevision,builtWith:{bun:Bun.version,craftSha256:artifacts.find((artifact)=>artifact.name===runtimeName)?.sha256},target:{platform:process.platform,architecture:process.arch,status:support.status,osVersions:support.osVersions},releaseChannel,artifacts},null,2)}
 `);writeFileSync(join(outputDir,"checksums.sha256"),`${artifacts.map((artifact)=>`${artifact.sha256}  ${artifact.name}`).join(`
 `)}
-`);log.success(`Built Craft desktop application in ${outputDir}`);
+`);log.success(`Built Craft desktop application in ${outputDir}`);if(ownsLauncher)log.info(`Using this application's own launcher (${launcherEntry}).`);

package/dist/build/dmg.js

@@ -1,4 +1,4 @@
-import{existsSync,mkdirSync,mkdtempSync,readFileSync,rmSync,symlinkSync,writeFileSync}from"node:fs";import{tmpdir}from"node:os";import{join}from"node:path";import process from"node:process";import{log,runCommand}from"@stacksjs/cli";import{projectPath,publicPath,resourcesPath,storagePath}from"@stacksjs/path";if(process.platform!=="darwin")throw Error("DMG packaging only runs on macOS");const desktopDist=storagePath("framework/desktop-dist"),manifestPath=join(desktopDist,"desktop.json");if(!existsSync(manifestPath))throw Error("Run `buddy build:desktop` before packaging a DMG");const manifest=JSON.parse(readFileSync(manifestPath,"utf8")),appName=process.env.DESKTOP_APP_NAME||manifest.title||process.env.APP_NAME||"Stacks",bundleId=process.env.DESKTOP_BUNDLE_ID||`sh.stacks.${appName.toLowerCase().replace(/[^a-z0-9]+/g,"-")}`,version=process.env.DESKTOP_APP_VERSION||"0.0.0",signingIdentity=process.env.DESKTOP_SIGNING_IDENTITY,outputDir=storagePath("framework/desktop-dmg");if(existsSync(outputDir))rmSync(outputDir,{recursive:!0});mkdirSync(outputDir,{recursive:!0});const staging=mkdtempSync(join(tmpdir(),"stacks-dmg-")),scratch=mkdtempSync(join(tmpdir(),"stacks-dmg-work-")),appDir=join(staging,`${appName}.app`),macosDir=join(appDir,"Contents/MacOS"),resourcesDir=join(appDir,"Contents/Resources");mkdirSync(macosDir,{recursive:!0});mkdirSync(resourcesDir,{recursive:!0});const launcherName="stacks-desktop";for(const file of[launcherName,"craft-runtime","desktop.json"])await runCommand(["cp",join(desktopDist,file),join(macosDir,file)],{cwd:projectPath()});async function buildIcon(){const source=[resourcesPath("assets/images/app-icon.png"),publicPath("images/app-icon.png"),publicPath("apple-touch-icon.png")].find((candidate)=>existsSync(candidate));if(!source)return;const iconset=join(scratch,"icon.iconset");mkdirSync(iconset,{recursive:!0});for(const size of[16,32,128,256,512]){await runCommand(["sips","-z",String(size),String(size),source,"--out",join(iconset,`icon_${size}x${size}.png`)],{cwd:scratch,silent:!0});await runCommand(["sips","-z",String(size*2),String(size*2),source,"--out",join(iconset,`icon_${size}x${size}@2x.png`)],{cwd:scratch,silent:!0})}const icns=join(resourcesDir,"AppIcon.icns");if((await runCommand(["iconutil","-c","icns",iconset,"-o",icns],{cwd:scratch})).isErr||!existsSync(icns))return;return"AppIcon"}const iconFile=await buildIcon();writeFileSync(join(appDir,"Contents/Info.plist"),`<?xml version="1.0" encoding="UTF-8"?>
+import{cpSync,existsSync,mkdirSync,mkdtempSync,readdirSync,readFileSync,rmSync,statSync,symlinkSync,writeFileSync}from"node:fs";import{tmpdir}from"node:os";import{join}from"node:path";import process from"node:process";import{log,runCommand}from"@stacksjs/cli";import{appPath,projectPath,publicPath,resourcesPath,storagePath}from"@stacksjs/path";if(process.platform!=="darwin")throw Error("DMG packaging only runs on macOS");const desktopDist=storagePath("framework/desktop-dist"),manifestPath=join(desktopDist,"desktop.json");if(!existsSync(manifestPath))throw Error("Run `buddy build:desktop` before packaging a DMG");const manifest=JSON.parse(readFileSync(manifestPath,"utf8")),ownsLauncher=manifest.launcher==="userland",appName=process.env.DESKTOP_APP_NAME||manifest.title||process.env.APP_NAME||"Stacks",bundleId=process.env.DESKTOP_BUNDLE_ID||`sh.stacks.${appName.toLowerCase().replace(/[^a-z0-9]+/g,"-")}`,version=process.env.DESKTOP_APP_VERSION||"0.0.0",signingIdentity=process.env.DESKTOP_SIGNING_IDENTITY,outputDir=storagePath("framework/desktop-dmg");if(existsSync(outputDir))rmSync(outputDir,{recursive:!0});mkdirSync(outputDir,{recursive:!0});const staging=mkdtempSync(join(tmpdir(),"stacks-dmg-")),scratch=mkdtempSync(join(tmpdir(),"stacks-dmg-work-")),appDir=join(staging,`${appName}.app`),macosDir=join(appDir,"Contents/MacOS"),resourcesDir=join(appDir,"Contents/Resources");mkdirSync(macosDir,{recursive:!0});mkdirSync(resourcesDir,{recursive:!0});const launcherName="stacks-desktop",bundledFiles=readdirSync(desktopDist).filter((name)=>statSync(join(desktopDist,name)).isFile());for(const file of bundledFiles)await runCommand(["cp",join(desktopDist,file),join(macosDir,file)],{cwd:projectPath()});if(!existsSync(join(macosDir,launcherName)))throw Error(`build:desktop did not produce ${launcherName}`);const userlandResources=appPath("Desktop/Resources");if(existsSync(userlandResources))cpSync(userlandResources,resourcesDir,{recursive:!0});async function buildIcon(){const source=[resourcesPath("assets/images/app-icon.png"),publicPath("images/app-icon.png"),publicPath("apple-touch-icon.png")].find((candidate)=>existsSync(candidate));if(!source)return;const iconset=join(scratch,"icon.iconset");mkdirSync(iconset,{recursive:!0});for(const size of[16,32,128,256,512]){await runCommand(["sips","-z",String(size),String(size),source,"--out",join(iconset,`icon_${size}x${size}.png`)],{cwd:scratch,silent:!0});await runCommand(["sips","-z",String(size*2),String(size*2),source,"--out",join(iconset,`icon_${size}x${size}@2x.png`)],{cwd:scratch,silent:!0})}const icns=join(resourcesDir,"AppIcon.icns");if((await runCommand(["iconutil","-c","icns",iconset,"-o",icns],{cwd:scratch})).isErr||!existsSync(icns))return;return"AppIcon"}const iconFile=await buildIcon();writeFileSync(join(appDir,"Contents/Info.plist"),`<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -12,9 +12,20 @@ import{existsSync,mkdirSync,mkdtempSync,readFileSync,rmSync,symlinkSync,writeFil
   <key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
   <key>LSMinimumSystemVersion</key><string>11.0</string>
   <key>NSHighResolutionCapable</key><true/>
-  <!-- The window loads a remote URL, so the app has to be allowed to reach it. -->
-  <key>NSAppTransportSecurity</key><dict><key>NSAllowsArbitraryLoads</key><true/></dict>${iconFile?`
+${ownsLauncher?`  <!-- The window talks to something this app started on loopback, so an
+       exception for 127.0.0.1 is all it needs. NSAllowsArbitraryLoads would
+       additionally permit every unencrypted host on the internet. -->
+  <key>NSAppTransportSecurity</key>
+  <dict>
+    <key>NSAllowsLocalNetworking</key><true/>
+    <key>NSExceptionDomains</key>
+    <dict>
+      <key>127.0.0.1</key>
+      <dict><key>NSExceptionAllowsInsecureHTTPLoads</key><true/></dict>
+    </dict>
+  </dict>`:`  <!-- The window loads a remote URL, so the app has to be allowed to reach it. -->
+  <key>NSAppTransportSecurity</key><dict><key>NSAllowsArbitraryLoads</key><true/></dict>`}${iconFile?`
   <key>CFBundleIconFile</key><string>${iconFile}</string>`:""}
 </dict>
 </plist>
-`);if(signingIdentity)for(const target of[join(macosDir,"craft-runtime"),join(macosDir,launcherName),appDir])await runCommand(["codesign","--force","--options","runtime","--sign",signingIdentity,target],{cwd:staging});symlinkSync("/Applications",join(staging,"Applications"));const dmgPath=join(outputDir,`${appName}-${version}.dmg`),created=await runCommand(["hdiutil","create","-volname",appName,"-srcfolder",staging,"-ov","-format","UDZO",dmgPath],{cwd:staging});if(created.isErr)throw Error(`hdiutil failed to create ${dmgPath}`);rmSync(staging,{recursive:!0,force:!0});rmSync(scratch,{recursive:!0,force:!0});log.success(`Built ${dmgPath}`);if(!signingIdentity)log.info("Unsigned build: Gatekeeper blocks the first launch. Right-click the app and choose Open, or set DESKTOP_SIGNING_IDENTITY and notarize before distributing.");
+`);if(signingIdentity){const nested=bundledFiles.filter((name)=>name!==launcherName&&!name.endsWith(".json")&&!name.endsWith(".sha256")).map((name)=>join(macosDir,name));for(const target of[...nested,join(macosDir,launcherName),appDir])await runCommand(["codesign","--force","--options","runtime","--sign",signingIdentity,target],{cwd:staging})}symlinkSync("/Applications",join(staging,"Applications"));const dmgPath=join(outputDir,`${appName}-${version}.dmg`),created=await runCommand(["hdiutil","create","-volname",appName,"-srcfolder",staging,"-ov","-format","UDZO",dmgPath],{cwd:staging});if(created.isErr)throw Error(`hdiutil failed to create ${dmgPath}`);rmSync(staging,{recursive:!0,force:!0});rmSync(scratch,{recursive:!0,force:!0});log.success(`Built ${dmgPath}`);if(!signingIdentity)log.info("Unsigned build: Gatekeeper blocks the first launch. Right-click the app and choose Open, or set DESKTOP_SIGNING_IDENTITY and notarize before distributing.");

package/dist/generate/action-types.d.ts

@@ -1,9 +1,24 @@
 /**
- * Write `storage/framework/types/actions.d.ts`.
+ * Write `storage/framework/auto-imports/routes.ts`.
  *
- * Controllers stay a pattern rather than a union: they are addressed as
- * `'Controllers/UserController@show'`, and the method half is a member name
- * that would need the file parsed rather than listed. Catching the shape is
- * what was already on offer for them, and it is unchanged.
+ * A RUNTIME map, not a declaration file. Every other name in the framework -
+ * actions, listeners, policies, middleware classes, jobs, models, tables - is
+ * derived from a map the resolver reads, so `keyof` and the resolution can
+ * never disagree. Route names could not join them, because a route name is
+ * produced by RUNNING code: it is attached by a chained `.name()` whose path
+ * may have come from a group prefix, and no static read of the source can know
+ * what `/users/{id}` a given `.name('users.show')` actually got.
+ *
+ * So this loads the route table, exactly as the OpenAPI generator does, and
+ * writes what it finds as a runtime value. `storage/framework/types/registries.d.ts`
+ * reads it with `typeof import(...)`. The list is still produced by a
+ * generator; what changed is that it is no longer a type nobody can check
+ * against anything - the router can resolve a name out of the same map.
+ *
+ * Best-effort on purpose. A route registry that fails to load writes an empty
+ * map, which the router reads as "no declaration" and falls back to accepting
+ * any name - the behaviour before any of this existed. Refusing to generate
+ * because one route file threw would be a much worse trade than an unchecked
+ * `url()`.
  */
-export declare function generateActionTypes(): Promise<void>;
+export declare function generateRouteNames(): Promise<void>;

package/dist/generate/action-types.js

@@ -1,46 +1,12 @@
-import{existsSync}from"node:fs";import{readdir}from"node:fs/promises";import{log}from"@stacksjs/logging";import{path as p}from"@stacksjs/path";import{storage}from"@stacksjs/storage";function actionDirectories(){const candidates=[p.appPath("Actions"),p.storagePath("framework/defaults/app/Actions")];try{const pkgJson=Bun.resolveSync("@stacksjs/defaults/package.json",process.cwd());candidates.push(`${pkgJson.slice(0,pkgJson.lastIndexOf("/"))}/app/Actions`)}catch{}return candidates.filter((dir)=>existsSync(dir))}async function collectActionPaths(){const found=new Set;for(const dir of actionDirectories()){const files=await readdir(dir,{recursive:!0});for(const file of files){if(!file.endsWith(".ts")||file.endsWith(".d.ts"))continue;found.add(`Actions/${file.slice(0,-3)}`)}}return[...found].sort()}async function collectMiddlewareAliases(){const found=new Set,candidates=[p.appPath("Middleware.ts"),p.storagePath("framework/defaults/app/Middleware.ts")];for(const file of candidates){if(!existsSync(file))continue;try{const module=await import(`${file}?t=${Date.now()}`);for(const alias of Object.keys(module.default??{}))found.add(alias)}catch{}}return[...found].sort()}async function collectNamedRoutes(){const registryFile=p.appPath("Routes.ts");if(!existsSync(registryFile))return{};try{const{listNamedRoutes,loadRoutes}=await import("@stacksjs/router"),{default:routeRegistry}=await import(registryFile);await loadRoutes(routeRegistry);return listNamedRoutes()}catch(error){log.debug("[generate:types] Could not load routes for named-route types",{error});return{}}}export async function generateActionTypes(){log.info("Generating action types...");const actions=await collectActionPaths();if(actions.length===0){log.debug("[generate:types] No action directories found; leaving actions.d.ts alone");return}const aliases=await collectMiddlewareAliases(),namedRoutes=await collectNamedRoutes(),union=actions.map((action)=>`
-  | '${action}'`).join(""),middlewareUnion=aliases.flatMap((alias)=>[`
-  | '${alias}'`,`
-  | '!${alias}'`]).join(""),routeEntries=Object.entries(namedRoutes).sort(([left],[right])=>left.localeCompare(right)).map(([name,routePath])=>`
-  '${name}': '${routePath}'`).join(""),contents=`// This file is auto-generated by Stacks. Do not edit this file manually.
-// If you wish to rename an action, please do so by editing the file name.
+import{existsSync}from"node:fs";import{log}from"@stacksjs/logging";import{path as p}from"@stacksjs/path";import{storage}from"@stacksjs/storage";async function collectNamedRoutes(){const registryFile=p.appPath("Routes.ts");if(!existsSync(registryFile))return{};try{const{listNamedRoutes,loadRoutes}=await import("@stacksjs/router"),{default:routeRegistry}=await import(registryFile);await loadRoutes(routeRegistry);return listNamedRoutes()}catch(error){log.debug("[generate:types] Could not load routes for named-route types",{error});return{}}}export async function generateRouteNames(){log.info("Generating route names...");const namedRoutes=await collectNamedRoutes(),entries=Object.entries(namedRoutes).sort(([left],[right])=>left.localeCompare(right)).map(([name,routePath])=>`
+  '${name}': '${routePath}',`).join(""),contents=`// This file is auto-generated by Stacks. Do not edit this file manually.
+//
+// Every named route, and the path it resolves to. Read as a type by
+// \`storage/framework/types/registries.d.ts\`, so \`url('users.show')\` is checked
+// against the routes this application registers - and readable at runtime by
+// anything that needs to resolve a name without loading the route table.
 //
 // For more information, please visit: https://stacksjs.com/docs
-
-/**
- * Every action this application can route to: its own, plus the framework
- * defaults it has not overridden.
- */
-export type ActionPath =${union}
-
-/**
- * Every middleware alias this application registers, and its negated form.
- */
-export type MiddlewareAlias =${middlewareUnion||`
-  | string`}
-
-/**
- * Every named route, and the path it resolves to.
- *
- * A type alias, NOT an interface: only aliases of object literals get an
- * implicit index signature, so an interface here fails the router's
- * \`extends Record<string, string>\` shape check and the whole map is quietly
- * ignored.
- */
-export type NamedRoutes = {${routeEntries?`${routeEntries}
-`:""}}
-
-/**
- * Handed to the router, so \`route.get(path, 'Actions/\u2026')\` and
- * \`.middleware('auth')\` are checked against the lists above rather than
- * against a string. A controller reference stays a pattern - the method half is
- * a member name, not a filename.
- */
-declare module '@stacksjs/bun-router' {
-  interface RouterTypeRegistry {
-    actions: ActionPath | \`\${string}Controller@\${string}\`
-    middleware: MiddlewareAlias
-    routes: NamedRoutes
-  }
-}
-`;await storage.writeFile(p.frameworkPath("types/actions.d.ts"),contents);log.debug(`[generate:types] Wrote ${actions.length} action paths, ${aliases.length} middleware aliases and ${Object.keys(namedRoutes).length} named routes`)}
+export const routeNames = {${entries?`${entries}
+`:""}} as const
+`;await storage.writeFile(p.storagePath("framework/auto-imports/routes.ts"),contents);log.debug(`[generate:types] Wrote ${Object.keys(namedRoutes).length} named routes`)}

package/dist/generate/index.js

@@ -1 +1 @@
-import*as fs from"node:fs";import process from"node:process";import{runCommand}from"@stacksjs/cli";import{Action,NpmScript}from"@stacksjs/enums";import{log}from"@stacksjs/logging";import{frameworkPath,projectPath,storagePath}from"@stacksjs/path";import{ExitCode}from"@stacksjs/types";import{runNpmScript}from"@stacksjs/utils";import{runAction}from"../helpers";import{generateVsCodeCustomData as genVsCodeCustomData}from"../helpers/vscode-custom-data";import{generateProjectImages}from"./images";import{generateActionTypes}from"./action-types";import{generateEnvFiles}from"./env-files";export{generateProjectImages}from"./images";export{generateVSchema}from"./vschema";export async function invoke(options){if(options?.types)await generateTypes(options);else if(options?.entries)await generateLibEntries(options);else if(options?.webTypes)await generateWebTypes(options);else if(options?.customData)await generateVsCodeCustomData();else if(options?.ideHelpers)await generateIdeHelpers(options);else if(options?.componentMeta)await generateComponentMeta();else if(options?.coreSymlink)await generateCoreSymlink();else if(options?.openApiSpec)await generateOpenApiSpec();else if(options?.images)await generateProjectImages({verbose:options?.verbose})}export function generate(options){return invoke(options)}export async function generateLibEntries(options){const result=await runAction(Action.GenerateLibraryEntries,{...options,cwd:projectPath()});if(result.isErr){log.error("There was an error generating your library entry points",result.error);process.exit(ExitCode.FatalError)}log.success("Library entry points generated successfully")}export async function generateWebTypes(options){const result=await runNpmScript(NpmScript.GenerateWebTypes,options);if(result.isErr){log.error("There was an error generating the web-types.json file.",result.error);process.exit(ExitCode.FatalError)}log.success("Successfully generated the web-types.json file")}export async function generateVsCodeCustomData(){const result=await genVsCodeCustomData();if(result.isErr){log.error("There was an error generating the custom-elements.json file.",result.error);process.exit(ExitCode.FatalError)}await runAction(Action.LintFix,{verbose:!0,cwd:projectPath()});log.success("Successfully generated the custom-elements.json file")}export async function generateIdeHelpers(options){const result=await runNpmScript(NpmScript.GenerateIdeHelpers,options);if(result.isErr){log.error("There was an error generating IDE helpers.",result.error);process.exit(ExitCode.FatalError)}await runAction(Action.LintFix,{verbose:!0,cwd:projectPath()});log.success("Successfully generated IDE helpers")}export async function generateComponentMeta(){const result=await genVsCodeCustomData();if(result.isErr){log.error("There was an error generating your component meta information.",result.error);process.exit(ExitCode.FatalError)}await runAction(Action.LintFix,{verbose:!0,cwd:projectPath()});log.success("Successfully generated component meta information")}export async function generateTypes(options){await generateEnvFiles();await generateActionTypes();try{const{generateServerAutoImportTypes}=await import("@stacksjs/server");await generateServerAutoImportTypes()}catch(error){log.debug("[generate:types] Could not refresh server auto-import declarations",{error})}const entry=frameworkPath("core/actions/src/generate/types.ts");if(!fs.existsSync(entry)){await import(`./types?t=${Date.now()}`);return}const result=await runNpmScript(NpmScript.GenerateTypes,{cwd:frameworkPath(),...options});if(result.isErr){log.error("There was an error generating your types.",result.error);throw result.error instanceof Error?result.error:Error(String(result.error))}log.success("Types were generated successfully")}export async function watchTypes(options){try{const manifestPath=`${frameworkPath()}/package.json`,text=fs.existsSync(manifestPath)?fs.readFileSync(manifestPath,"utf-8"):"";if(!(text?JSON.parse(text):{})?.scripts?.["generate:types"]){log.warn("[generate:types --watch] no `generate:types` script in framework package.json - type regeneration disabled. dev:api will keep running, but type definitions won't auto-refresh on model/config changes.");return}}catch{}const watched=[projectPath("app/Models"),storagePath("framework/defaults/app/Models"),projectPath("config"),projectPath("database/migrations")];log.info(`[generate:types --watch] watching ${watched.length} directories`);let pending=null,inflight=!1;const trigger=()=>{if(pending)clearTimeout(pending);pending=setTimeout(async()=>{if(inflight)return;inflight=!0;try{log.info("[generate:types --watch] change detected, regenerating\u2026");await generateTypes(options);log.success("[generate:types --watch] types up to date")}catch(err){log.error("[generate:types --watch] regeneration failed:",err)}finally{inflight=!1}},200)},watchers=[];for(const dir of watched)try{if(!fs.existsSync(dir))continue;const w=fs.watch(dir,{recursive:!0},()=>trigger());watchers.push(w)}catch(err){log.warn(`[generate:types --watch] cannot watch ${dir}: ${err}`)}if(watchers.length===0){log.warn("[generate:types --watch] no directories to watch - exiting");return}await new Promise((resolve)=>{process.once("SIGINT",()=>{log.info("[generate:types --watch] stopping");for(const w of watchers)try{w.close()}catch{}resolve()})})}export function generatePantryConfig(){log.success("Successfully generated `./pantry.yaml` based on your config")}export async function generateSeeder(){}export async function generateCoreSymlink(){const link=projectPath(".framework");if(fs.existsSync(link))await runCommand(`rm -f ${link}`);await runCommand(`ln -s ${frameworkPath()} ${link}`)}export async function generateOpenApiSpec(){const{generateOpenApi}=await import("@stacksjs/api");await generateOpenApi();log.success("Successfully generated Open API Spec")}
+import*as fs from"node:fs";import process from"node:process";import{runCommand}from"@stacksjs/cli";import{Action,NpmScript}from"@stacksjs/enums";import{log}from"@stacksjs/logging";import{frameworkPath,projectPath}from"@stacksjs/path";import{ExitCode}from"@stacksjs/types";import{runNpmScript}from"@stacksjs/utils";import{runAction}from"../helpers";import{generateVsCodeCustomData as genVsCodeCustomData}from"../helpers/vscode-custom-data";import{generateProjectImages}from"./images";import{generateRouteNames}from"./action-types";export{generateProjectImages}from"./images";export{generateVSchema}from"./vschema";export async function invoke(options){if(options?.types)await generateTypes(options);else if(options?.entries)await generateLibEntries(options);else if(options?.webTypes)await generateWebTypes(options);else if(options?.customData)await generateVsCodeCustomData();else if(options?.ideHelpers)await generateIdeHelpers(options);else if(options?.componentMeta)await generateComponentMeta();else if(options?.coreSymlink)await generateCoreSymlink();else if(options?.openApiSpec)await generateOpenApiSpec();else if(options?.images)await generateProjectImages({verbose:options?.verbose})}export function generate(options){return invoke(options)}export async function generateLibEntries(options){const result=await runAction(Action.GenerateLibraryEntries,{...options,cwd:projectPath()});if(result.isErr){log.error("There was an error generating your library entry points",result.error);process.exit(ExitCode.FatalError)}log.success("Library entry points generated successfully")}export async function generateWebTypes(options){const result=await runNpmScript(NpmScript.GenerateWebTypes,options);if(result.isErr){log.error("There was an error generating the web-types.json file.",result.error);process.exit(ExitCode.FatalError)}log.success("Successfully generated the web-types.json file")}export async function generateVsCodeCustomData(){const result=await genVsCodeCustomData();if(result.isErr){log.error("There was an error generating the custom-elements.json file.",result.error);process.exit(ExitCode.FatalError)}await runAction(Action.LintFix,{verbose:!0,cwd:projectPath()});log.success("Successfully generated the custom-elements.json file")}export async function generateIdeHelpers(options){const result=await runNpmScript(NpmScript.GenerateIdeHelpers,options);if(result.isErr){log.error("There was an error generating IDE helpers.",result.error);process.exit(ExitCode.FatalError)}await runAction(Action.LintFix,{verbose:!0,cwd:projectPath()});log.success("Successfully generated IDE helpers")}export async function generateComponentMeta(){const result=await genVsCodeCustomData();if(result.isErr){log.error("There was an error generating your component meta information.",result.error);process.exit(ExitCode.FatalError)}await runAction(Action.LintFix,{verbose:!0,cwd:projectPath()});log.success("Successfully generated component meta information")}export async function generateTypes(options){try{const{generateAutoImportFiles}=await import("@stacksjs/server");await generateAutoImportFiles()}catch(error){log.debug("[generate:types] Could not refresh the auto-import registries",{error})}await generateRouteNames();try{const{generateServerAutoImportTypes}=await import("@stacksjs/server");await generateServerAutoImportTypes()}catch(error){log.debug("[generate:types] Could not refresh server auto-import declarations",{error})}const entry=frameworkPath("core/actions/src/generate/types.ts");if(!fs.existsSync(entry)){await import(`./types?t=${Date.now()}`);return}const result=await runNpmScript(NpmScript.GenerateTypes,{cwd:frameworkPath(),...options});if(result.isErr){log.error("There was an error generating your types.",result.error);throw result.error instanceof Error?result.error:Error(String(result.error))}log.success("Types were generated successfully")}export async function watchTypes(options){try{const manifestPath=`${frameworkPath()}/package.json`,text=fs.existsSync(manifestPath)?fs.readFileSync(manifestPath,"utf-8"):"";if(!(text?JSON.parse(text):{})?.scripts?.["generate:types"]){log.warn("[generate:types --watch] no `generate:types` script in framework package.json - type regeneration disabled. dev:api will keep running, but type definitions won't auto-refresh on model/config changes.");return}}catch{}const watched=[...await(async()=>{try{const{autoImportSourceDirs}=await import("@stacksjs/server");return autoImportSourceDirs()}catch{return[]}})(),projectPath("config"),projectPath("database/migrations"),projectPath("app"),projectPath("routes")].filter((dir,index,all)=>all.indexOf(dir)===index);log.info(`[generate:types --watch] watching ${watched.length} directories`);let pending=null,inflight=!1;const trigger=()=>{if(pending)clearTimeout(pending);pending=setTimeout(async()=>{if(inflight)return;inflight=!0;try{log.info("[generate:types --watch] change detected, regenerating\u2026");await generateTypes(options);log.success("[generate:types --watch] types up to date")}catch(err){log.error("[generate:types --watch] regeneration failed:",err)}finally{inflight=!1}},200)},watchers=[];for(const dir of watched)try{if(!fs.existsSync(dir))continue;const w=fs.watch(dir,{recursive:!0},()=>trigger());watchers.push(w)}catch(err){log.warn(`[generate:types --watch] cannot watch ${dir}: ${err}`)}if(watchers.length===0){log.warn("[generate:types --watch] no directories to watch - exiting");return}await new Promise((resolve)=>{process.once("SIGINT",()=>{log.info("[generate:types --watch] stopping");for(const w of watchers)try{w.close()}catch{}resolve()})})}export function generatePantryConfig(){log.success("Successfully generated `./pantry.yaml` based on your config")}export async function generateSeeder(){}export async function generateCoreSymlink(){const link=projectPath(".framework");if(fs.existsSync(link))await runCommand(`rm -f ${link}`);await runCommand(`ln -s ${frameworkPath()} ${link}`)}export async function generateOpenApiSpec(){const{generateOpenApi}=await import("@stacksjs/api");await generateOpenApi();log.success("Successfully generated Open API Spec")}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/actions",
   "type": "module",
   "sideEffects": false,
-  "version": "0.72.97",
+  "version": "0.72.99",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "contributors": [
@@ -60,36 +60,36 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/config": "0.72.97",
+    "@stacksjs/config": "0.72.99",
     "@stacksjs/bumpx": "^0.2.6",
     "@stacksjs/bunpress": "^0.2.8",
     "@stacksjs/logsmith": "^0.2.3",
-    "@stacksjs/registry": "0.72.97",
-    "@stacksjs/stx": "^0.2.235",
+    "@stacksjs/registry": "0.72.99",
+    "@stacksjs/stx": "^0.2.245",
     "@stacksjs/ts-cloud": "^0.12.7",
     "@stacksjs/ts-md": "^0.1.1"
   },
   "devDependencies": {
-    "@stacksjs/api": "0.72.97",
-    "@stacksjs/cli": "0.72.97",
-    "@stacksjs/database": "0.72.97",
+    "@stacksjs/api": "0.72.99",
+    "@stacksjs/cli": "0.72.99",
+    "@stacksjs/database": "0.72.99",
     "@stacksjs/tlsx": "^0.13.2",
     "better-dx": "^0.2.24",
-    "@stacksjs/dns": "0.72.97",
-    "@stacksjs/enums": "0.72.97",
-    "@stacksjs/env": "0.72.97",
-    "@stacksjs/error-handling": "0.72.97",
-    "@stacksjs/image": "0.72.97",
-    "@stacksjs/logging": "0.72.97",
-    "@stacksjs/path": "0.72.97",
-    "@stacksjs/security": "0.72.97",
-    "@stacksjs/server": "0.72.97",
-    "@stacksjs/cms": "0.72.97",
-    "@stacksjs/sites": "0.72.97",
-    "@stacksjs/storage": "0.72.97",
-    "@stacksjs/strings": "0.72.97",
-    "@stacksjs/utils": "0.72.97",
-    "@stacksjs/validation": "0.72.97"
+    "@stacksjs/dns": "0.72.99",
+    "@stacksjs/enums": "0.72.99",
+    "@stacksjs/env": "0.72.99",
+    "@stacksjs/error-handling": "0.72.99",
+    "@stacksjs/image": "0.72.99",
+    "@stacksjs/logging": "0.72.99",
+    "@stacksjs/path": "0.72.99",
+    "@stacksjs/security": "0.72.99",
+    "@stacksjs/server": "0.72.99",
+    "@stacksjs/cms": "0.72.99",
+    "@stacksjs/sites": "0.72.99",
+    "@stacksjs/storage": "0.72.99",
+    "@stacksjs/strings": "0.72.99",
+    "@stacksjs/utils": "0.72.99",
+    "@stacksjs/validation": "0.72.99"
   },
   "peerDependencies": {
     "pickier": "^0.1.58",

package/dist/generate/env-files.d.ts

@@ -1,23 +0,0 @@
-/**
- * The text of `storage/framework/types/env.d.ts`.
- *
- * Bun's `env` namespace only. The `env` exported by '@stacksjs/env' used to be
- * augmented from here too, and that was the wrong source: the key set came
- * from whichever `.env` was on the machine running the generator, so a
- * variable set only in deploy secrets could never be typed, and each type was
- * read off the variable's live value, so the same variable could be `number`
- * here and `string` on a colleague's checkout. `StacksEnv` is now extended
- * from `config/env.ts`, which declares those variables anyway and is committed.
- *
- * Pure, so the shape can be asserted without writing into the framework.
- */
-export declare function renderEnvTypes(keys: string[], typeOf: (key: string) => string): string;
-/**
- * Write `storage/framework/types/env.d.ts` and `storage/framework/env.ts`.
- *
- * This was a top-level script with nothing importing it — no command, no
- * build step, no test referenced the file — so the declarations it owns were
- * whatever the last person to run it by hand had produced. `generateTypes()`
- * calls it now.
- */
-export declare function generateEnvFiles(): Promise<void>;

package/dist/generate/env-files.js

@@ -1,46 +0,0 @@
-import{env as e,envEnum,parse}from"@stacksjs/env";import{log}from"@stacksjs/logging";import{path as p}from"@stacksjs/path";import{storage}from"@stacksjs/storage";import{existsSync,readFileSync}from"node:fs";function previouslyDeclaredKeys(){const file=p.frameworkPath("env.ts");if(!existsSync(file))return[];return[...(readFileSync(file,"utf8").match(/export const envKeys = \[([^\]]*)\]/)?.[1]??"").matchAll(/'([A-Z0-9_]+)'/g)].map((match)=>match[1])}function resolveEnvKeys(){const keys=new Set(previouslyDeclaredKeys());for(const file of[".env",".env.example"]){const path=p.projectPath(file);if(!existsSync(path))continue;for(const key of Object.keys(parse(readFileSync(path,"utf8")).parsed))keys.add(key)}return[...keys].sort()}export function renderEnvTypes(keys,typeOf){return`
-// This file is auto-generated by Stacks. Do not edit this file manually.
-// If you want to change the environment variables, please edit the .env file.
-//
-// This types \`Bun.env.SOMETHING\`. The \`env\` exported by '@stacksjs/env' is
-// typed from your \`config/env.ts\` instead - declare a variable there and it
-// is typed everywhere, with no generation step:
-//
-//   const envSchema = defineEnv({
-//     STRIPE_WEBHOOK_SECRET: { validation: schema.string(), default: '' },
-//   })
-//
-//   declare module '@stacksjs/env' {
-//     interface StacksEnv extends InferEnv<typeof envSchema> {}
-//   }
-//
-//   export default envSchema
-//
-// For more information, please visit: https://stacksjs.com/docs
-
-// Marks this file as a module, which is what makes the block below an
-// augmentation. In a global script file \`declare module 'x'\` declares an
-// ambient module instead, shadowing the real one \u2014 which took '@stacksjs/env'
-// down to only the members named here and broke every \`import { env }\` in
-// config/ with "has no exported member 'env'".
-export {}
-
-declare module 'bun' {
-  namespace env {
-    ${keys.map((key)=>`const ${key}: ${typeOf(key)}`).join(`
-    `)}
-  }
-}
-`}export async function generateEnvFiles(){log.info("Generating type env files...");const resolvedKeys=resolveEnvKeys();function typeOf(key){let type=typeof e[key],value=e[key];if(!value)if(envEnum[key]){type=envEnum[key]?.map((item)=>`'${item}'`).join(" | ");value=envEnum[key]?.[0]}else switch(type){case"number":value="0";break;case"boolean":value=!1;break;default:value=""}type="string";if(typeof value==="string"){if(value.toLowerCase()==="true"||value.toLowerCase()==="false")type="boolean";else if(!Number.isNaN(Number.parseFloat(value))&&Number.isFinite(Number(value)))type="number";else if(envEnum[key])type=envEnum[key].map((item)=>`'${item}'`).join(" | ")}else if(typeof value==="number")type="number";else if(typeof value==="boolean")type="boolean";return type}const envTypes=renderEnvTypes(resolvedKeys,typeOf);await storage.writeFile(p.frameworkPath("types/env.d.ts"),envTypes);log.info("  - ./storage/framework/env.ts");const env=`
-// This file is auto-generated by Stacks. Do not edit this file manually.
-// If you want to change the environment variables, please edit the .env file.
-//
-// For more information, please visit: https://stacksjs.com/docs
-
-export const envKeys = [
-  ${resolvedKeys.map((key)=>`'${key}'`).join(`,
-  `)}
-] as const
-
-export type EnvKey = typeof envKeys[number]
-`;await storage.writeFile(p.frameworkPath("env.ts"),env);log.info("  - ./storage/framework/env.d.ts")}