schematic-pg 0.1.0 → 0.1.2

package/README.md

@@ -196,7 +196,6 @@ Install the CLI and scaffold a new project:
 ```bash
 npx schematic-pg init my-app
 cd my-app
-npm install
 ```
 
 Edit `app.schema`, then generate code and start the API:
@@ -261,7 +260,7 @@ The `schematic-pg` binary is the primary interface. Each command accepts an opti
 ### Project setup
 
 ```bash
-schematic-pg init [dir]     # Scaffold a new project (default: current directory)
+schematic-pg init [dir] [--skip-install]  # Scaffold a new project (runs npm install by default)
 ```
 
 ### Code generation

package/dist/api/auth/policy-types.d.ts

@@ -0,0 +1,6 @@
+export type PolicyOperation = 'select' | 'insert' | 'update' | 'delete';
+export interface NormalizedPolicy {
+    role: string;
+    operations: PolicyOperation[] | 'all';
+    where?: string;
+}

package/dist/api/auth/policy-types.js

@@ -0,0 +1 @@
+export {};

package/dist/api/auth/policy.d.ts

@@ -1,7 +1,9 @@
 import type { WhereInput } from '../../db/where-translator.js';
-import { type NormalizedPolicy, type PolicyOperation } from 'generated/policies.js';
+import type { NormalizedPolicy, PolicyOperation } from './policy-types.js';
 import type { AuthContext } from './types.js';
+export type { NormalizedPolicy, PolicyOperation } from './policy-types.js';
 export { ForbiddenError, UnauthorizedError } from './errors.js';
+export declare function configurePolicies(next: Record<string, NormalizedPolicy[]>): void;
 export declare function assertPolicy(model: string, role: string, operation: PolicyOperation): NormalizedPolicy;
 export declare function resolvePolicyWhere(policy: NormalizedPolicy, auth: AuthContext): WhereInput | undefined;
 export declare function mergeWhere(primary: Record<string, unknown>, policyWhere?: WhereInput): Record<string, unknown>;

package/dist/api/auth/policy.js

@@ -1,15 +1,18 @@
-import { POLICIES } from 'generated/policies.js';
 import { ForbiddenError } from './errors.js';
 import { interpolateTemplate } from './template.js';
 import { PUBLIC_ROLE } from './types.js';
-const SIMPLE_WHERE_PATTERN = /^(\w+)\s*(=|!=|<>|>=|<=|>|<)\s*(.+)$/;
 export { ForbiddenError, UnauthorizedError } from './errors.js';
+const SIMPLE_WHERE_PATTERN = /^(\w+)\s*(=|!=|<>|>=|<=|>|<)\s*(.+)$/;
+let policies = {};
+export function configurePolicies(next) {
+    policies = next;
+}
 export function assertPolicy(model, role, operation) {
-    const policies = POLICIES[model];
-    if (!policies || policies.length === 0) {
+    const modelPolicies = policies[model];
+    if (!modelPolicies || modelPolicies.length === 0) {
         throw new ForbiddenError(`No policies configured for model "${model}"`);
     }
-    const policy = findPolicyForRole(policies, role);
+    const policy = findPolicyForRole(modelPolicies, role);
     if (!policy) {
         throw new ForbiddenError(`Role "${role}" is not allowed to ${operation} ${model}`);
     }
@@ -34,13 +37,13 @@ export function mergeWhere(primary, policyWhere) {
     }
     return { AND: [primary, policyWhere] };
 }
-function findPolicyForRole(policies, role) {
-    const directMatch = policies.find((policy) => policy.role === role);
+function findPolicyForRole(modelPolicies, role) {
+    const directMatch = modelPolicies.find((policy) => policy.role === role);
     if (directMatch) {
         return directMatch;
     }
     if (role !== PUBLIC_ROLE) {
-        return policies.find((policy) => policy.role === PUBLIC_ROLE);
+        return modelPolicies.find((policy) => policy.role === PUBLIC_ROLE);
     }
     return undefined;
 }

package/dist/api/middleware/db.d.ts

@@ -1,8 +1,8 @@
 import { Pool } from 'pg';
 import type { MiddlewareHandler } from 'hono';
-import type { DbClient } from 'generated/db.js';
+import type { DbClient } from '../../types/generated-db.stub.js';
 import type { AppEnv } from '../types.js';
-export declare const db: DbClient;
-export declare function createDbMiddleware(options?: {
+export declare function createDbMiddleware(options: {
     pool?: Pool;
+    createDbClient: (pool: Pool) => DbClient;
 }): MiddlewareHandler<AppEnv>;

package/dist/api/middleware/db.js

@@ -1,10 +1,8 @@
 import { Pool } from 'pg';
-import { createDbClient } from 'generated/db.js';
 import { getDatabaseUrl } from '../../db/config.js';
-const pool = new Pool({ connectionString: getDatabaseUrl() });
-export const db = createDbClient(pool);
-export function createDbMiddleware(options = {}) {
-    const client = options.pool ? createDbClient(options.pool) : db;
+export function createDbMiddleware(options) {
+    const pool = options.pool ?? new Pool({ connectionString: getDatabaseUrl() });
+    const client = options.createDbClient(pool);
     return async (c, next) => {
         c.set('db', client);
         await next();

package/dist/api-generator/app-generator.js

@@ -37,6 +37,9 @@ export class AppGenerator {
             "import { prettyJSON } from 'hono/pretty-json';",
             "import { serve } from '@hono/node-server';",
             routeImports,
+            "import { createDbClient } from './db.js';",
+            "import { POLICIES } from './policies.js';",
+            `import { configurePolicies } from '${PACKAGE_NAME}/api/auth/policy';`,
             `import { createAuthMiddleware } from '${PACKAGE_NAME}/api/auth/middleware';`,
             `import { createJwtResolver } from '${PACKAGE_NAME}/api/auth/jwt-resolver';`,
             `import type { AuthResolver } from '${PACKAGE_NAME}/api/auth/types';`,
@@ -44,6 +47,8 @@ export class AppGenerator {
             `import { handleError } from '${PACKAGE_NAME}/api/middleware/errors';`,
             `import type { AppEnv } from '${PACKAGE_NAME}/api/types';`,
             '',
+            'configurePolicies(POLICIES);',
+            '',
             'export interface CreateAppOptions {',
             '  pool?: Pool;',
             '  authResolver?: AuthResolver;',
@@ -53,7 +58,7 @@ export class AppGenerator {
             '  const app = new Hono<AppEnv>();',
             '  app.use(logger());',
             '  app.use(prettyJSON());',
-            '  app.use(createDbMiddleware({ pool: options.pool }));',
+            '  app.use(createDbMiddleware({ pool: options.pool, createDbClient }));',
             '  app.use(createAuthMiddleware(options.authResolver ?? createJwtResolver()));',
             '  app.onError(handleError);',
             '',

package/dist/api-generator/policy-generator.js

@@ -1,3 +1,4 @@
+import { PACKAGE_NAME } from '../constants.js';
 import { hasPolicies, normalizePolicies, serializePolicy, } from './utils/policy.js';
 export class PolicyGenerator {
     schema;
@@ -13,13 +14,7 @@ export class PolicyGenerator {
         });
         return [
             '// Auto-generated by PolicyGenerator. Do not edit manually.',
-            "export type PolicyOperation = 'select' | 'insert' | 'update' | 'delete';",
-            '',
-            'export interface NormalizedPolicy {',
-            '  role: string;',
-            "  operations: PolicyOperation[] | 'all';",
-            '  where?: string;',
-            '}',
+            `import type { NormalizedPolicy } from '${PACKAGE_NAME}/api/auth/policy';`,
             '',
             'export const POLICIES: Record<string, NormalizedPolicy[]> = {',
             policyEntries.join(',\n'),

package/dist/cli/init.js

@@ -1,3 +1,4 @@
+import { spawn } from 'node:child_process';
 import { PACKAGE_NAME } from '../constants.js';
 import { existsSync } from 'node:fs';
 import { mkdir, readdir, writeFile } from 'node:fs/promises';
@@ -17,7 +18,25 @@ function resolveTargetDir(args) {
 function resolveProjectName(targetDir) {
     return path.basename(targetDir) || `${PACKAGE_NAME}-app`;
 }
+function runNpmInstall(cwd) {
+    return new Promise((resolve, reject) => {
+        const child = spawn('npm', ['install'], {
+            cwd,
+            stdio: 'inherit',
+            shell: process.platform === 'win32',
+        });
+        child.on('error', reject);
+        child.on('close', (code) => {
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(`npm install failed with exit code ${code}`));
+        });
+    });
+}
 export async function runInit(args) {
+    const skipInstall = args.includes('--skip-install');
     const targetDir = resolveTargetDir(args);
     const projectName = resolveProjectName(targetDir);
     if (targetDir !== process.cwd() && existsSync(targetDir)) {
@@ -45,11 +64,17 @@ export async function runInit(args) {
     else {
         console.log('Skipped existing file: package.json');
     }
+    if (!skipInstall) {
+        console.log('\nRunning npm install...');
+        await runNpmInstall(targetDir);
+    }
     console.log('\nNext steps:');
     if (targetDir !== process.cwd()) {
         console.log(`  cd ${targetDir}`);
     }
-    console.log('  npm install');
+    if (skipInstall) {
+        console.log('  npm install');
+    }
     console.log('  docker compose up -d');
     console.log(`  npx ${PACKAGE_NAME} generate`);
     console.log(`  npx ${PACKAGE_NAME} db:bootstrap`);

package/dist/cli/templates.js

@@ -59,10 +59,6 @@ export function createPackageJsonTemplate(projectName) {
         version: '0.1.0',
         private: true,
         type: 'module',
-        imports: {
-            'generated/db.js': './generated/db.js',
-            'generated/policies.js': './generated/policies.js',
-        },
         scripts: {
             dev: `${PACKAGE_NAME} dev`,
             generate: `${PACKAGE_NAME} generate`,

package/dist/cli.js

@@ -7,7 +7,7 @@ import { PACKAGE_NAME } from './constants.js';
 const USAGE = `Usage: ${PACKAGE_NAME} <command> [options]
 
 Commands:
-  init [dir]                 Scaffold a new project
+  init [dir] [--skip-install] Scaffold a new project
   generate [schema]          Generate schema.sql, db client, and API
   generate:sql [schema]      Generate SQL DDL to stdout
   generate:client [schema]   Generate db client files

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "schematic-pg",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Single-file backend framework for PostgreSQL and Node.js",
   "type": "module",
   "license": "MIT",
@@ -14,7 +14,7 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-    "schematic-pg": "./dist/cli.js"
+    "schematic-pg": "dist/cli.js"
   },
   "files": [
     "dist/",
@@ -25,10 +25,6 @@
     "editors/vscode",
     "editors/language-server"
   ],
-  "imports": {
-    "generated/db.js": "./generated/db.js",
-    "generated/policies.js": "./generated/policies.js"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",