@fabrika/provider-zerops 0.2.0 → 0.3.2

package/src/authoring.ts

@@ -1,6 +1,7 @@
 import { ZEROPS_SHARED_POSTGRES_CONNECTION_STRING } from './namespace'
 export { zeropsSharedServiceHostname, zeropsSharedServicePrefix } from './service-names'
 import { APP_PROVIDER, isProviderAuthoredApp, type ProviderAuthoredApp } from '@fabrika/provider-contract'
+import { z } from 'zod'
 import type { ZeropsAppConfig, ZeropsSharedPostgresBinding } from './types'
 
 /** Declare consumption of the namespace-owned `postgres` service without resolving its credential. */
@@ -20,14 +21,10 @@ export const defineApp = (config: ZeropsAppConfig): ZeropsAuthoredAppConfig => {
 	return { ...config, [APP_PROVIDER]: 'zerops' }
 }
 
-const property = (value: unknown, key: string): unknown => typeof value === 'object' && value !== null ? Reflect.get(value, key) : undefined
+const zeropsAppConfigSchema = z.object({
+	id: z.string().refine((id) => id.trim() !== ''),
+	target: z.object({ platform: z.literal('zerops'), services: z.function() }),
+})
 
-export const isZeropsAppConfig = (value: unknown): value is ZeropsAuthoredAppConfig => {
-	const id = property(value, 'id')
-	const target = property(value, 'target')
-	return isProviderAuthoredApp(value, 'zerops')
-		&& typeof id === 'string'
-		&& id.trim() !== ''
-		&& property(target, 'platform') === 'zerops'
-		&& typeof property(target, 'services') === 'function'
-}
+export const isZeropsAppConfig = (value: unknown): value is ZeropsAuthoredAppConfig =>
+	isProviderAuthoredApp(value, 'zerops') && zeropsAppConfigSchema.safeParse(value).success

package/src/cli-args.ts

@@ -1,3 +1,4 @@
+import { describeArgument } from '@fabrika/installation-init'
 export interface ZeropsCliArgs {
 	command: string | undefined
 	subcommand: string | undefined
@@ -13,7 +14,6 @@ export interface ZeropsCliArgs {
 	publicAccess: string | undefined
 	postgresType: string | undefined
 	postgresProfile: string | undefined
-	proxyBuildFromGit: string | undefined
 	controlUrl: string | undefined
 	help: boolean
 }
@@ -33,7 +33,6 @@ export const parseZeropsCliArgs = (argv: readonly string[]): ZeropsCliArgs => {
 	let publicAccess: string | undefined
 	let postgresType: string | undefined
 	let postgresProfile: string | undefined
-	let proxyBuildFromGit: string | undefined
 	let controlUrl: string | undefined
 	let help = false
 
@@ -64,8 +63,6 @@ export const parseZeropsCliArgs = (argv: readonly string[]): ZeropsCliArgs => {
 			postgresType = arg.slice('--postgres-type='.length)
 		} else if (arg.startsWith('--postgres-profile=')) {
 			postgresProfile = arg.slice('--postgres-profile='.length)
-		} else if (arg.startsWith('--proxy-build-from-git=')) {
-			proxyBuildFromGit = arg.slice('--proxy-build-from-git='.length)
 		} else if (arg.startsWith('--control-url=')) {
 			controlUrl = arg.slice('--control-url='.length)
 		} else if (arg.startsWith('-')) {
@@ -75,7 +72,7 @@ export const parseZeropsCliArgs = (argv: readonly string[]): ZeropsCliArgs => {
 		} else if (subcommand === undefined && command === 'namespace') {
 			subcommand = arg
 		} else {
-			throw new Error(`Unexpected argument: ${arg}`)
+			throw new Error(`Unexpected argument: ${describeArgument(arg)}`)
 		}
 	}
 
@@ -94,7 +91,6 @@ export const parseZeropsCliArgs = (argv: readonly string[]): ZeropsCliArgs => {
 		publicAccess,
 		postgresType,
 		postgresProfile,
-		proxyBuildFromGit,
 		controlUrl,
 		help,
 	}

package/src/cli.ts

@@ -2,6 +2,7 @@
 import { constants } from 'node:fs'
 import { open } from 'node:fs/promises'
 import { resolve } from 'node:path'
+import { z } from 'zod'
 import { isZeropsAppConfig } from './authoring'
 import { parseZeropsCliArgs } from './cli-args'
 import {
@@ -10,44 +11,26 @@ import {
 	manifestServiceHostnames,
 	ZEROPS_SOURCE_DESCRIPTOR_MAX_BYTES,
 } from './manifest'
-import { runZeropsNamespaceCommand } from './namespace-command'
 import type { ZeropsAppConfig } from './types'
 
 const USAGE = `Zerops app tools
 
 Usage:
   fabrika app build --provider=zerops --env=<env> [--config=<path>] [--output=<path>]
-  fabrika namespace plan --provider=zerops --id=<id> --env=<env> --preset=<cheap|mid|full> [namespace options]
-  fabrika namespace create --provider=zerops --id=<id> --env=<env> --preset=<cheap|mid|full> [namespace options] [--control-url=<url>]
-  fabrika namespace adopt --provider=zerops --id=<id> --env=<env> --preset=<cheap|mid|full> --project-id=<id> [namespace options] [--control-url=<url>]
-  fabrika namespace reconcile --provider=zerops --id=<id> [--control-url=<url>]
 
 Options:
   --env=<env>                    Environment.
   --config=<path>                App config (default: ./fabrika.config.ts).
   --output=<path>                Artifact path (default: ./fabrika.manifest.json).
-  --id=<id>                      Namespace id.
-  --preset=<cheap|mid|full>      Provider-owned namespace preset.
-  --exclusive-app=<id>           App reserved by a full namespace.
-  --project-id=<id>              Existing Zerops project id for adoption.
-  --project-name=<name>          Zerops project name (default: namespace id).
-  --core-package=<tier>          LIGHT or SERIOUS.
-  --public-access=<mode>         custom-domain or zerops-subdomain.
-  --postgres-type=<type>         Cheap-tier PostgreSQL type.
-  --postgres-profile=<profile>   Cheap-tier PostgreSQL profile.
-  --proxy-build-from-git=<url>   Public proxy source; or FABRIKA_ZEROPS_PROXY_BUILD_FROM_GIT.
-  --control-url=<url>            Control origin; or FABRIKA_CONTROL_URL.
   -h, --help                     Show this help.
-
-Mutating namespace commands read the Bearer credential from FABRIKA_CONTROL_TOKEN.
 `
 
-const property = (value: unknown, key: string): unknown => typeof value === 'object' && value !== null ? Reflect.get(value, key) : undefined
+const configModuleSchema = z.object({ default: z.unknown() })
 
 const loadConfig = async (path: string): Promise<ZeropsAppConfig> => {
 	const absolute = resolve(process.cwd(), path)
 	const loaded: unknown = await import(absolute)
-	const config = property(loaded, 'default')
+	const config = configModuleSchema.safeParse(loaded).data?.default
 	if (!isZeropsAppConfig(config)) {
 		throw new Error(`Config at ${absolute} must default-export defineApp({ target: { platform: 'zerops', ... } })`)
 	}
@@ -92,14 +75,6 @@ export const runZeropsCli = async (argv: readonly string[]): Promise<void> => {
 		console.info(USAGE)
 		return
 	}
-	if (args.command === 'namespace') {
-		await runZeropsNamespaceCommand(args, {
-			source: process.env,
-			fetch: globalThis.fetch,
-			write: (value) => console.info(value.trimEnd()),
-		})
-		return
-	}
 	if (args.command !== 'build') {
 		throw new Error(`Unknown command: ${args.command}\n${USAGE}`)
 	}

package/src/collaborators.ts

@@ -1,7 +1,7 @@
 import { reconcileSchema } from '@fabrika/auth'
 import type { SchemaReconciler } from '@fabrika/provider-contract'
 import { createZeropsApi, type ZeropsApi } from './api'
-import type { ZeropsSourceClient } from './source'
+import type { ZeropsSourcePort } from './source/port'
 import type { ZeropsRuntimeTarget } from './types'
 
 export type Sleeper = (ms: number, signal: AbortSignal) => Promise<void>
@@ -26,9 +26,7 @@ export const defaultSleep: Sleeper = (ms, signal) =>
 export interface ZeropsCollaborators {
 	api: ZeropsApi
 	/** Injected by the Zerops control composition; dry runs do not require it. */
-	source?: ZeropsSourceClient
-	/** Independently bounds best-effort source cancellation without delaying Zerops cleanup. */
-	sourceCancelSleep?: Sleeper
+	source?: ZeropsSourcePort
 	reconcileSchema: SchemaReconciler
 	sleep: Sleeper
 }

package/src/compile.ts

@@ -280,6 +280,8 @@ const isYamlHostileCodePoint = (code: number): boolean =>
 	|| code === 0x2028
 	|| code === 0x2029
 	|| code === 0xfeff
+	|| code === 0xfffe
+	|| code === 0xffff
 	|| (code >= 0xd800 && code <= 0xdfff)
 
 /** `JSON.stringify` leaves DEL, the C1 block, U+2028/9 and U+FEFF raw; YAML's own `\uXXXX` carries them. */
@@ -291,7 +293,7 @@ const escapeYamlHostile = (quoted: string): string =>
 
 const scalar = (value: string): string => {
 	// Reserved plain scalars that YAML would read as booleans/null, plus anything with structure.
-	const reserved = new Set(['true', 'false', 'null', 'yes', 'no', 'on', 'off', '~'])
+	const reserved = new Set(['true', 'false', 'null', 'yes', 'no', 'y', 'n', 'on', 'off', '~'])
 	if (value !== '' && PLAIN.test(value) && !reserved.has(value.toLowerCase())) {
 		return value
 	}