@appstrate/validation 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appstrate/validation",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "files": ["src"],
   "exports": {

package/src/dependencies.ts

@@ -6,20 +6,18 @@ export interface DepEntry {
 }
 
 export function extractDependencies(manifest: Record<string, unknown>): DepEntry[] {
-  const requires = manifest.requires as
+  const registryDependencies = manifest.registryDependencies as
     | {
-        registryDependencies?: {
-          skills?: Record<string, string>;
-          extensions?: Record<string, string>;
-        };
+        skills?: Record<string, string>;
+        extensions?: Record<string, string>;
       }
     | undefined;
 
-  if (!requires?.registryDependencies) return [];
+  if (!registryDependencies) return [];
 
   const deps: DepEntry[] = [];
 
-  const { skills = {}, extensions = {} } = requires.registryDependencies;
+  const { skills = {}, extensions = {} } = registryDependencies;
 
   for (const [fullName, versionRange] of Object.entries(skills)) {
     const { scope, name } = parseScopedName(fullName);

package/src/index.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
 import semver from "semver";
+import { SLUG_REGEX } from "./naming.ts";
 
-export const SLUG_REGEX = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
+export { SLUG_REGEX };
 
 const flowFieldTypeEnum = z.enum(["string", "number", "boolean", "array", "object", "file"]);
 
@@ -73,20 +74,14 @@ export const baseManifestSchema = z.object({
 export type BaseManifest = z.infer<typeof baseManifestSchema>;
 
 // ─────────────────────────────────────────────
-// Flow manifest schema — extends base with flow-specific fields
+// Shared flow fields — used by both flowManifestSchema and localFlowManifestSchema
 // ─────────────────────────────────────────────
 
-export const flowManifestSchema = baseManifestSchema.extend({
-  $schema: z.string().optional(),
-  schemaVersion: z.string(),
-  displayName: z.string().min(1),
-  author: z.string(),
-  tags: z.array(z.string()).optional(),
+const flowSharedFields = {
   requires: z.object({
     services: z.array(serviceRequirementSchema),
     skills: z.array(slugString).optional().default([]),
     extensions: z.array(slugString).optional().default([]),
-    registryDependencies: registryDependenciesSchema,
   }),
   input: z
     .object({
@@ -109,6 +104,19 @@ export const flowManifestSchema = baseManifestSchema.extend({
       outputRetries: z.number().min(0).max(5).optional(),
     })
     .optional(),
+} as const;
+
+// ─────────────────────────────────────────────
+// Flow manifest schema — extends base with flow-specific fields
+// ─────────────────────────────────────────────
+
+export const flowManifestSchema = baseManifestSchema.extend({
+  $schema: z.string().optional(),
+  schemaVersion: z.string(),
+  displayName: z.string().min(1),
+  author: z.string(),
+  tags: z.array(z.string()).optional(),
+  ...flowSharedFields,
 });
 
 export type FlowManifest = z.infer<typeof flowManifestSchema>;
@@ -121,11 +129,11 @@ export type ManifestSchema = FlowManifest;
 // Unified validateManifest — dispatches by type
 // ─────────────────────────────────────────────
 
-export function validateManifest(raw: unknown): {
-  valid: boolean;
-  errors: string[];
-  manifest?: unknown;
-} {
+export type ValidateManifestResult =
+  | { valid: true; errors: []; manifest: BaseManifest | FlowManifest }
+  | { valid: false; errors: string[]; manifest?: undefined };
+
+export function validateManifest(raw: unknown): ValidateManifestResult {
   // First, check if it has a type field to dispatch
   if (raw && typeof raw === "object" && "type" in raw) {
     const obj = raw as Record<string, unknown>;
@@ -148,11 +156,7 @@ export function validateManifest(raw: unknown): {
   return validateFlowManifest(raw);
 }
 
-function validateFlowManifest(raw: unknown): {
-  valid: boolean;
-  errors: string[];
-  manifest?: unknown;
-} {
+function validateFlowManifest(raw: unknown): ValidateManifestResult {
   const result = flowManifestSchema.safeParse(raw);
   if (result.success) {
     return { valid: true, errors: [], manifest: result.data };
@@ -240,33 +244,7 @@ export const localFlowManifestSchema = z.looseObject({
   tags: z.array(z.string()).optional(),
   type: z.string().optional(),
   version: z.string().optional(),
-  requires: z.object({
-    services: z.array(serviceRequirementSchema),
-    skills: z.array(slugString).optional().default([]),
-    extensions: z.array(slugString).optional().default([]),
-    registryDependencies: registryDependenciesSchema,
-  }),
-  input: z
-    .object({
-      schema: jsonSchemaObjectSchema,
-    })
-    .optional(),
-  output: z
-    .object({
-      schema: jsonSchemaObjectSchema,
-    })
-    .optional(),
-  config: z
-    .object({
-      schema: jsonSchemaObjectSchema,
-    })
-    .optional(),
-  execution: z
-    .object({
-      timeout: z.number().optional(),
-      outputRetries: z.number().min(0).max(5).optional(),
-    })
-    .optional(),
+  ...flowSharedFields,
 });
 
 export type LocalFlowManifest = z.infer<typeof localFlowManifestSchema>;

package/src/naming.ts

@@ -1,11 +1,32 @@
-import { SLUG_REGEX } from "./index.ts";
-
-export { SLUG_REGEX };
+export const SLUG_REGEX = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
 
 export function normalizeScope(scope: string): string {
+  if (!scope) throw new Error("Scope cannot be empty");
   return scope.startsWith("@") ? scope : `@${scope}`;
 }
 
 export function stripScope(scope: string): string {
   return scope.startsWith("@") ? scope.slice(1) : scope;
 }
+
+/** Convert "@scope/name" to strate packageId "scope--name" */
+export function scopedNameToPackageId(scopedName: string): string {
+  const match = scopedName.match(/^@([a-z0-9][a-z0-9-]*[a-z0-9]?)\/([a-z0-9][a-z0-9-]*[a-z0-9]?)$/);
+  if (!match) throw new Error(`Invalid scoped package name: ${scopedName}`);
+  return `${match[1]}--${match[2]}`;
+}
+
+/** Convert strate packageId "scope--name" to "@scope/name", or null for local slugs */
+export function packageIdToScopedName(packageId: string): string | null {
+  const idx = packageId.indexOf("--");
+  if (idx === -1) return null;
+  const scope = packageId.slice(0, idx);
+  const name = packageId.slice(idx + 2);
+  if (!scope || !name) return null;
+  return `@${scope}/${name}`;
+}
+
+/** Convert separated scope + name to strate packageId */
+export function depEntryToPackageId(depScope: string, depName: string): string {
+  return `${stripScope(depScope)}--${depName}`;
+}