Add workspace resolver support and update create-gen-app tests for new boilerplates

packages/create-gen-app-test/README.md

@@ -20,7 +20,7 @@ This package provides functionality to clone and cache template repositories for
 import { createFromCachedTemplate } from 'create-gen-app-test';
 
 const result = await createFromCachedTemplate({
-  templateUrl: 'https://github.com/launchql/pgpm-boilerplates',
+  templateUrl: 'https://github.com/constructive-io/pgpm-boilerplates',
   outputDir: './my-new-project',
   answers: {
     PROJECT_NAME: 'my-project',
@@ -65,7 +65,7 @@ Create project from cached template.
 
 The package includes comprehensive integration tests that:
 
-1. Clone real repositories from GitHub (default: https://github.com/launchql/pgpm-boilerplates)
+1. Clone real repositories from GitHub (default: https://github.com/constructive-io/pgpm-boilerplates)
 2. Cache templates using appstash
 3. Process templates with variable replacement
 4. Snapshot generated files and package.json files

packages/create-gen-app-test/dev/README.md

@@ -25,8 +25,8 @@ pnpm dev --output ./my-generated-template
 
 ## What it does
 
-1. **Clones the default repository**: `https://github.com/launchql/pgpm-boilerplates/` (override via `--repo`, select branch via `--branch`)
-2. **Lists available templates**: looks for subdirectories inside `--path` (default `.`; typically `module`, `workspace`)
+1. **Clones the default repository**: `https://github.com/constructive-io/pgpm-boilerplates/` (override via `--repo`, select branch via `--branch`)
+2. **Lists available templates**: looks for subdirectories inside `--path` (default `default`; typically contains `module`, `workspace`)
 3. **Prompts for selection**: Uses `inquirerer` to display an interactive list of templates
 4. **Processes the template**:
    - Extracts variables from the selected folder
@@ -39,9 +39,9 @@ pnpm dev --output ./my-generated-template
 
 Command-line flags override the defaults below (see `dev/index.ts`):
 
-- `--repo` (`-r`): repository URL to clone (default: `https://github.com/launchql/pgpm-boilerplates/`)
+- `--repo` (`-r`): repository URL to clone (default: `https://github.com/constructive-io/pgpm-boilerplates/`)
 - `--branch` (`-b`): branch or tag to checkout
-- `--path` (`-p`): directory within the repo to scan for templates (default: `.`)
+- `--path` (`-p`): directory within the repo to scan for templates (default: `default`)
 - `--template` (`-t`): template folder to use (e.g., `module`, `workspace`); if omitted, an interactive list appears
 - `--output` (`-o`): output directory for generated project (default: `./test-output`)
 
@@ -51,7 +51,7 @@ Command-line flags override the defaults below (see `dev/index.ts`):
 $ pnpm dev
 🚀 create-gen-app development script
 
-Cloning template from https://github.com/launchql/pgpm-boilerplates/...
+Cloning template from https://github.com/constructive-io/pgpm-boilerplates/...
 
 Found 2 template(s): module, workspace
 
@@ -73,4 +73,3 @@ Extracting template variables...
 - The temporary clone directory is automatically cleaned up after generation
 - You can test different templates without affecting your workspace
 
-

packages/create-gen-app-test/dev/index.ts

@@ -5,8 +5,8 @@ import * as path from "path";
 
 import { cloneRepo, extractVariables, promptUser, replaceVariables } from "create-gen-app";
 
-const DEFAULT_REPO = "https://github.com/launchql/pgpm-boilerplates/";
-const DEFAULT_DIRECTORY = ".";
+const DEFAULT_REPO = "https://github.com/constructive-io/pgpm-boilerplates/";
+const DEFAULT_DIRECTORY = "default";
 const OUTPUT_DIR = "./test-output";
 
 const argv = minimist(process.argv.slice(2), {
@@ -116,4 +116,3 @@ async function main() {
 
 main();
 
-

packages/create-gen-app-test/src/__tests__/__snapshots__/cached-template.test.ts.snap

@@ -2,6 +2,7 @@
 
 exports[`cached template integration tests first clone with variable replacement should snapshot created directory structure 1`] = `
 [
+  ".boilerplate.json",
   "LICENSE",
   "README.md",
   "__tests__/",
@@ -21,7 +22,7 @@ exports[`cached template integration tests first clone with variable replacement
     "description": "Integration test module test",
     "devDependencies": {
       "makage": "0.1.8",
-      "pgsql-test": "^2.14.12",
+      "pgsql-test": "^2.16.2",
     },
     "homepage": "https://github.com/tester-test/integration-test",
     "keywords": [],
@@ -38,7 +39,7 @@ exports[`cached template integration tests first clone with variable replacement
     "scripts": {
       "lint": "eslint . --fix",
       "test": "jest",
-      "test:watch": "makage test --watch deploy --ext sql",
+      "test:watch": "jest --watch",
     },
     "version": "0.0.1",
   },
@@ -47,6 +48,7 @@ exports[`cached template integration tests first clone with variable replacement
 
 exports[`cached template integration tests second clone from cache should snapshot created directory structure from cache 1`] = `
 [
+  ".boilerplate.json",
   "LICENSE",
   "README.md",
   "__tests__/",
@@ -66,7 +68,7 @@ exports[`cached template integration tests second clone from cache should snapsh
     "description": "Integration test module cached",
     "devDependencies": {
       "makage": "0.1.8",
-      "pgsql-test": "^2.14.12",
+      "pgsql-test": "^2.16.2",
     },
     "homepage": "https://github.com/tester-cached/integration-cached",
     "keywords": [],
@@ -83,7 +85,7 @@ exports[`cached template integration tests second clone from cache should snapsh
     "scripts": {
       "lint": "eslint . --fix",
       "test": "jest",
-      "test:watch": "makage test --watch deploy --ext sql",
+      "test:watch": "jest --watch",
     },
     "version": "0.0.1",
   },

packages/create-gen-app-test/src/__tests__/cached-template.test.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 import { appstash, resolve } from 'appstash';
 
 import { createFromTemplate, CacheManager, GitCloner } from '../index';
-import { buildAnswers, TEST_REPO, TEST_TEMPLATE } from '../test-utils/integration-helpers';
+import { buildAnswers, TEST_REPO, TEST_TEMPLATE_PATH } from '../test-utils/integration-helpers';
 
 const DEFAULT_TEMPLATE_URL = TEST_REPO;
 
@@ -98,7 +98,7 @@ describe('cached template integration tests', () => {
         answers: buildAnswers('test'),
         toolName: testCacheTool,
         noTty: true,
-        fromPath: TEST_TEMPLATE
+        fromPath: TEST_TEMPLATE_PATH
       });
     }, 60000);
 
@@ -166,7 +166,7 @@ describe('cached template integration tests', () => {
         answers: buildAnswers('warmup'),
         toolName: testCacheTool,
         noTty: true,
-        fromPath: TEST_TEMPLATE
+        fromPath: TEST_TEMPLATE_PATH
       });
 
       secondOutputDir = fs.mkdtempSync(path.join(os.tmpdir(), 'second-clone-'));
@@ -177,7 +177,7 @@ describe('cached template integration tests', () => {
         answers: buildAnswers('cached'),
         toolName: testCacheTool,
         noTty: true,
-        fromPath: TEST_TEMPLATE
+        fromPath: TEST_TEMPLATE_PATH
       });
     }, 60000);
 

packages/create-gen-app-test/src/__tests__/cli.test.ts

@@ -5,6 +5,7 @@ import { runCli } from "../cli";
 import {
   TEST_BRANCH,
   TEST_REPO,
+  TEST_TEMPLATE_DIR,
   TEST_TEMPLATE,
   buildAnswers,
   cleanupWorkspace,
@@ -24,7 +25,7 @@ describe("CLI integration via create-gen-app-test harness", () => {
       "--branch",
       TEST_BRANCH,
       "--path",
-      ".",
+      TEST_TEMPLATE_DIR,
       "--template",
       TEST_TEMPLATE,
       "--output",

packages/create-gen-app-test/src/cli.ts

@@ -7,10 +7,10 @@ import { Inquirerer, ListQuestion } from "inquirerer";
 import minimist, { ParsedArgs } from "minimist";
 
 import { CacheManager, GitCloner, checkNpmVersion } from "create-gen-app";
-import { createFromTemplate } from './index';
+import { createFromTemplate } from "./index";
 
-const DEFAULT_REPO = "https://github.com/launchql/pgpm-boilerplates.git";
-const DEFAULT_PATH = ".";
+const DEFAULT_REPO = "https://github.com/constructive-io/pgpm-boilerplates.git";
+const DEFAULT_PATH = "default";
 const DEFAULT_OUTPUT_FALLBACK = "create-gen-app-output";
 const DEFAULT_TOOL_NAME = "create-gen-app-test";
 const DEFAULT_TTL = 604800000; // 1 week
@@ -134,7 +134,7 @@ export async function runCli(
     console.warn(
       `⚠️  Cached template expired (last updated: ${new Date(expiredMetadata.lastUpdated).toLocaleString()})`
     );
-    console.log('Updating cache...');
+    console.log("Updating cache...");
     cacheManager.clear(cacheKey);
   }
 
@@ -150,7 +150,7 @@ export async function runCli(
     gitCloner.clone(normalizedUrl, tempDest, { branch: args.branch, depth: 1 });
     cacheManager.set(cacheKey, tempDest);
     templateDir = tempDest;
-    console.log('Template cached for future runs');
+    console.log("Template cached for future runs");
   }
 
   try {
@@ -209,8 +209,8 @@ export async function runCli(
     const answerOverrides = extractAnswerOverrides(args);
     const noTty = Boolean(
       args["no-tty"] ??
-        (args as Record<string, unknown>).noTty ??
-        (args as Record<string, unknown>).tty === false
+      (args as Record<string, unknown>).noTty ??
+      (args as Record<string, unknown>).tty === false
     );
 
     // Use the createFromTemplate function which will use the same cache
@@ -330,7 +330,9 @@ if (require.main === module) {
 }
 
 function resolveTtlOption(args: ParsedArgs): number | undefined {
-  const disableTtl = Boolean(args["no-ttl"] ?? (args as Record<string, unknown>).noTtl);
+  const disableTtl = Boolean(
+    args["no-ttl"] ?? (args as Record<string, unknown>).noTtl
+  );
   if (disableTtl) {
     return undefined;
   }

packages/create-gen-app-test/src/test-utils/integration-helpers.ts

@@ -4,11 +4,16 @@ import * as path from "path";
 
 export const TEST_REPO =
   process.env.CREATE_GEN_TEST_REPO ??
-  "https://github.com/launchql/pgpm-boilerplates.git";
+  "https://github.com/constructive-io/pgpm-boilerplates.git";
 export const TEST_BRANCH =
-  process.env.CREATE_GEN_TEST_BRANCH ?? "license";
+  process.env.CREATE_GEN_TEST_BRANCH ?? "main";
+export const TEST_TEMPLATE_DIR =
+  process.env.CREATE_GEN_TEST_BASE_PATH ?? "default";
 export const TEST_TEMPLATE =
   process.env.CREATE_GEN_TEST_TEMPLATE ?? "module";
+export const TEST_TEMPLATE_PATH =
+  process.env.CREATE_GEN_TEST_TEMPLATE_PATH ??
+  path.join(TEST_TEMPLATE_DIR, TEST_TEMPLATE);
 
 export interface TempWorkspace {
   baseDir: string;

packages/inquirerer/README.md

@@ -747,6 +747,19 @@ Inquirerer comes with several built-in resolvers ready to use:
 | `date.now` | ISO timestamp | `"2025-11-23T15:30:45.123Z"` |
 | `date.timestamp` | Unix timestamp (ms) | `"1732375845123"` |
 
+#### Workspace (nearest package.json)
+
+| Resolver | Description | Example Output |
+|----------|-------------|----------------|
+| `workspace.name` | Repo slug from `repository` URL (fallback: `package.json` `name`) | `"dev-utils"` |
+| `workspace.repo.name` | Repo name from `repository` URL | `"dev-utils"` |
+| `workspace.repo.organization` | Repo org/owner from `repository` URL | `"constructive-io"` |
+| `workspace.organization.name` | Alias for `workspace.repo.organization` | `"constructive-io"` |
+| `workspace.license` | License field from `package.json` | `"MIT"` |
+| `workspace.author` | Author name from `package.json` | `"Constructive"` |
+| `workspace.author.name` | Author name from `package.json` | `"Constructive"` |
+| `workspace.author.email` | Author email from `package.json` | `"[email protected]"` |
+
 ### Priority Order
 
 When resolving default values, inquirerer follows this priority:
@@ -1047,4 +1060,4 @@ const handler: CommandHandler = async (argv, prompter) => {
 
 const cli = new CLI(handler, options);
 await cli.run();
-```
+```

packages/inquirerer/__tests__/resolvers.test.ts

@@ -499,13 +499,23 @@ describe('Debug Mode', () => {
 
 describe('Workspace Resolvers', () => {
     it('should have workspace resolvers registered by default', () => {
+        expect(globalResolverRegistry.has('workspace.name')).toBe(true);
         expect(globalResolverRegistry.has('workspace.repo.name')).toBe(true);
         expect(globalResolverRegistry.has('workspace.repo.organization')).toBe(true);
+        expect(globalResolverRegistry.has('workspace.organization.name')).toBe(true);
+        expect(globalResolverRegistry.has('workspace.license')).toBe(true);
         expect(globalResolverRegistry.has('workspace.author')).toBe(true);
         expect(globalResolverRegistry.has('workspace.author.name')).toBe(true);
         expect(globalResolverRegistry.has('workspace.author.email')).toBe(true);
     });
 
+    it('should resolve workspace.name preferring repo name', async () => {
+        const result = await globalResolverRegistry.resolve('workspace.name');
+
+        // Repository slug of dev-utils package
+        expect(result).toBe('dev-utils');
+    });
+
     it('should resolve workspace.repo.name from package.json', async () => {
         // This test runs from the dev-utils directory which has a package.json with repository
         const result = await globalResolverRegistry.resolve('workspace.repo.name');
@@ -520,6 +530,18 @@ describe('Workspace Resolvers', () => {
         expect(result).toBe('constructive-io');
     });
 
+    it('should resolve workspace.organization.name from package.json', async () => {
+        const result = await globalResolverRegistry.resolve('workspace.organization.name');
+
+        expect(result).toBe('constructive-io');
+    });
+
+    it('should resolve workspace.license from package.json', async () => {
+        const result = await globalResolverRegistry.resolve('workspace.license');
+
+        expect(result).toBe('MIT');
+    });
+
     it('should resolve workspace.author from package.json', async () => {
         const result = await globalResolverRegistry.resolve('workspace.author');
 

packages/inquirerer/__tests__/setFrom.test.ts

@@ -149,6 +149,34 @@ describe('Inquirerer - setFrom feature', () => {
 
       expect(result).toEqual({ year: '1967' });
     });
+
+    it('should use workspace resolvers with setFrom', async () => {
+      const prompter = new Inquirerer({
+        input: mockInput,
+        output: mockOutput,
+        noTty: true
+      });
+
+      const questions: Question[] = [
+        {
+          name: 'repoName',
+          type: 'text',
+          setFrom: 'workspace.name'
+        },
+        {
+          name: 'license',
+          type: 'text',
+          setFrom: 'workspace.license'
+        }
+      ];
+
+      const result = await prompter.prompt({}, questions);
+
+      expect(result).toEqual({
+        repoName: 'dev-utils',
+        license: 'MIT'
+      });
+    });
   });
 
   describe('setFrom vs defaultFrom behavior', () => {

packages/inquirerer/src/resolvers/workspace.ts

@@ -88,6 +88,18 @@ function parseAuthor(author: string | { name?: string; email?: string; url?: str
  * These resolve values from the nearest package.json in the current working directory.
  */
 export const workspaceResolvers: ResolverRegistry = {
+    'workspace.name': () => {
+        const pkg = findPackageJsonFromCwd();
+        if (!pkg) return undefined;
+        const url = getRepositoryUrl(pkg);
+        // Prefer repo slug when repository is set; fall back to package name
+        if (url) {
+            const parsed = parseGitHubUrl(url);
+            if (parsed.name) return parsed.name;
+        }
+        return pkg.name;
+    },
+
     'workspace.repo.name': () => {
         const pkg = findPackageJsonFromCwd();
         if (!pkg) return undefined;
@@ -104,6 +116,20 @@ export const workspaceResolvers: ResolverRegistry = {
         return parseGitHubUrl(url).organization;
     },
 
+    // Alias for repo.organization for template readability
+    'workspace.organization.name': () => {
+        const pkg = findPackageJsonFromCwd();
+        if (!pkg) return undefined;
+        const url = getRepositoryUrl(pkg);
+        if (!url) return undefined;
+        return parseGitHubUrl(url).organization;
+    },
+
+    'workspace.license': () => {
+        const pkg = findPackageJsonFromCwd();
+        return pkg?.license;
+    },
+
     'workspace.author': () => {
         const pkg = findPackageJsonFromCwd();
         if (!pkg) return undefined;