skuba 0.0.0-master-20231001235226 → 0.0.0-master-20231121000709

package/lib/cli/init/types.d.ts

@@ -1,28 +1,100 @@
-import * as t from 'runtypes';
-export type InitConfigInput = t.Static<typeof InitConfigInput>;
-export declare const InitConfigInput: t.Record<{
-    destinationDir: t.String;
-    templateComplete: t.Boolean;
-    templateData: t.Intersect<[t.Record<{
-        ownerName: t.String;
-        repoName: t.String;
-        platformName: t.Union<[t.Literal<"amd64">, t.Literal<"arm64">]>;
-    }, false>, t.Dictionary<t.String, string>]>;
-    templateName: t.String;
-}, false>;
-export type InitConfig = t.Static<typeof InitConfig>;
-declare const InitConfig: t.Record<{
-    templateData: t.Intersect<[t.Record<{
-        ownerName: t.String;
-        repoName: t.String;
-        orgName: t.String;
-        teamName: t.String;
-        port: t.String;
-    }, false>, t.Dictionary<t.String, string>]>;
-    entryPoint: t.Optional<t.String>;
-    type: t.Optional<t.Union<[t.Literal<"application">, t.Literal<"package">]>>;
-    destinationDir: t.String;
-    templateComplete: t.Boolean;
-    templateName: t.String;
-}, false>;
+import { z } from 'zod';
+export type InitConfigInput = z.infer<typeof initConfigInputSchema>;
+export declare const initConfigInputSchema: z.ZodObject<{
+    destinationDir: z.ZodString;
+    templateComplete: z.ZodBoolean;
+    templateData: z.ZodObject<{
+        ownerName: z.ZodString;
+        repoName: z.ZodString;
+        platformName: z.ZodUnion<[z.ZodLiteral<"amd64">, z.ZodLiteral<"arm64">]>;
+    }, "strip", z.ZodString, z.objectOutputType<{
+        ownerName: z.ZodString;
+        repoName: z.ZodString;
+        platformName: z.ZodUnion<[z.ZodLiteral<"amd64">, z.ZodLiteral<"arm64">]>;
+    }, z.ZodString, "strip">, z.objectInputType<{
+        ownerName: z.ZodString;
+        repoName: z.ZodString;
+        platformName: z.ZodUnion<[z.ZodLiteral<"amd64">, z.ZodLiteral<"arm64">]>;
+    }, z.ZodString, "strip">>;
+    templateName: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    templateName: string;
+    destinationDir: string;
+    templateComplete: boolean;
+    templateData: {
+        repoName: string;
+        ownerName: string;
+        platformName: "arm64" | "amd64";
+    } & {
+        [k: string]: string;
+    };
+}, {
+    templateName: string;
+    destinationDir: string;
+    templateComplete: boolean;
+    templateData: {
+        repoName: string;
+        ownerName: string;
+        platformName: "arm64" | "amd64";
+    } & {
+        [k: string]: string;
+    };
+}>;
+export type InitConfig = z.infer<typeof initConfigSchema>;
+declare const initConfigSchema: z.ZodObject<{
+    templateName: z.ZodString;
+    destinationDir: z.ZodString;
+    templateComplete: z.ZodBoolean;
+    templateData: z.ZodObject<{
+        ownerName: z.ZodString;
+        repoName: z.ZodString;
+        orgName: z.ZodString;
+        teamName: z.ZodString;
+        port: z.ZodString;
+    }, "strip", z.ZodString, z.objectOutputType<{
+        ownerName: z.ZodString;
+        repoName: z.ZodString;
+        orgName: z.ZodString;
+        teamName: z.ZodString;
+        port: z.ZodString;
+    }, z.ZodString, "strip">, z.objectInputType<{
+        ownerName: z.ZodString;
+        repoName: z.ZodString;
+        orgName: z.ZodString;
+        teamName: z.ZodString;
+        port: z.ZodString;
+    }, z.ZodString, "strip">>;
+    entryPoint: z.ZodOptional<z.ZodString>;
+    type: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"application">, z.ZodLiteral<"package">]>>;
+}, "strip", z.ZodTypeAny, {
+    templateName: string;
+    destinationDir: string;
+    templateComplete: boolean;
+    templateData: {
+        port: string;
+        orgName: string;
+        repoName: string;
+        ownerName: string;
+        teamName: string;
+    } & {
+        [k: string]: string;
+    };
+    entryPoint?: string | undefined;
+    type?: "package" | "application" | undefined;
+}, {
+    templateName: string;
+    destinationDir: string;
+    templateComplete: boolean;
+    templateData: {
+        port: string;
+        orgName: string;
+        repoName: string;
+        ownerName: string;
+        teamName: string;
+    } & {
+        [k: string]: string;
+    };
+    entryPoint?: string | undefined;
+    type?: "package" | "application" | undefined;
+}>;
 export {};

package/lib/cli/init/types.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,49 +15,42 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var types_exports = {};
 __export(types_exports, {
-  InitConfigInput: () => InitConfigInput
+  initConfigInputSchema: () => initConfigInputSchema
 });
 module.exports = __toCommonJS(types_exports);
-var t = __toESM(require("runtypes"));
+var import_zod = require("zod");
 var import_manifest = require("../../utils/manifest");
-const INIT_CONFIG_INPUT_FIELDS = {
-  destinationDir: t.String,
-  templateComplete: t.Boolean,
-  templateData: t.Record({
-    ownerName: t.String,
-    repoName: t.String,
-    platformName: t.Union(t.Literal("amd64"), t.Literal("arm64"))
-  }).And(t.Dictionary(t.String, t.String)),
-  templateName: t.String
-};
-const InitConfigInput = t.Record(INIT_CONFIG_INPUT_FIELDS);
-const InitConfig = t.Record({
-  ...INIT_CONFIG_INPUT_FIELDS,
-  templateData: t.Record({
-    ownerName: t.String,
-    repoName: t.String,
+const initConfigInputSchema = import_zod.z.object({
+  destinationDir: import_zod.z.string(),
+  templateComplete: import_zod.z.boolean(),
+  templateData: import_zod.z.object({
+    ownerName: import_zod.z.string(),
+    repoName: import_zod.z.string(),
+    platformName: import_zod.z.union([import_zod.z.literal("amd64"), import_zod.z.literal("arm64")])
+  }).catchall(import_zod.z.string()),
+  templateName: import_zod.z.string()
+});
+const initConfigSchema = initConfigInputSchema.omit({
+  templateData: true
+}).extend({
+  templateData: import_zod.z.object({
+    ownerName: import_zod.z.string(),
+    repoName: import_zod.z.string(),
     // Derived from ownerName
-    orgName: t.String,
-    teamName: t.String,
+    // TODO: use zod to transform `InitConfigInput` -> `InitConfig`?
+    orgName: import_zod.z.string(),
+    teamName: import_zod.z.string(),
     // Generated by init command
-    port: t.String
-  }).And(t.Dictionary(t.String, t.String)),
-  entryPoint: t.String.optional(),
-  type: import_manifest.ProjectType.optional()
+    port: import_zod.z.string()
+  }).catchall(import_zod.z.string()),
+  entryPoint: import_zod.z.string().optional(),
+  type: import_manifest.projectTypeSchema.optional()
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  InitConfigInput
+  initConfigInputSchema
 });
 //# sourceMappingURL=types.js.map

package/lib/cli/init/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/init/types.ts"],
-  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport * as t from 'runtypes';\n\nimport { ProjectType } from '../../utils/manifest';\n\nconst INIT_CONFIG_INPUT_FIELDS = {\n  destinationDir: t.String,\n  templateComplete: t.Boolean,\n  templateData: t\n    .Record({\n      ownerName: t.String,\n      repoName: t.String,\n      platformName: t.Union(t.Literal('amd64'), t.Literal('arm64')),\n    })\n    .And(t.Dictionary(t.String, t.String)),\n  templateName: t.String,\n};\n\nexport type InitConfigInput = t.Static<typeof InitConfigInput>;\n\nexport const InitConfigInput = t.Record(INIT_CONFIG_INPUT_FIELDS);\n\nexport type InitConfig = t.Static<typeof InitConfig>;\n\nconst InitConfig = t.Record({\n  ...INIT_CONFIG_INPUT_FIELDS,\n\n  templateData: t\n    .Record({\n      ownerName: t.String,\n      repoName: t.String,\n\n      // Derived from ownerName\n      orgName: t.String,\n      teamName: t.String,\n\n      // Generated by init command\n      port: t.String,\n    })\n    .And(t.Dictionary(t.String, t.String)),\n\n  entryPoint: t.String.optional(),\n  type: ProjectType.optional(),\n});\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,QAAmB;AAEnB,sBAA4B;AAE5B,MAAM,2BAA2B;AAAA,EAC/B,gBAAgB,EAAE;AAAA,EAClB,kBAAkB,EAAE;AAAA,EACpB,cAAc,EACX,OAAO;AAAA,IACN,WAAW,EAAE;AAAA,IACb,UAAU,EAAE;AAAA,IACZ,cAAc,EAAE,MAAM,EAAE,QAAQ,OAAO,GAAG,EAAE,QAAQ,OAAO,CAAC;AAAA,EAC9D,CAAC,EACA,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;AAAA,EACvC,cAAc,EAAE;AAClB;AAIO,MAAM,kBAAkB,EAAE,OAAO,wBAAwB;AAIhE,MAAM,aAAa,EAAE,OAAO;AAAA,EAC1B,GAAG;AAAA,EAEH,cAAc,EACX,OAAO;AAAA,IACN,WAAW,EAAE;AAAA,IACb,UAAU,EAAE;AAAA;AAAA,IAGZ,SAAS,EAAE;AAAA,IACX,UAAU,EAAE;AAAA;AAAA,IAGZ,MAAM,EAAE;AAAA,EACV,CAAC,EACA,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;AAAA,EAEvC,YAAY,EAAE,OAAO,SAAS;AAAA,EAC9B,MAAM,4BAAY,SAAS;AAC7B,CAAC;",
+  "sourcesContent": ["import { z } from 'zod';\n\nimport { projectTypeSchema } from '../../utils/manifest';\n\nexport type InitConfigInput = z.infer<typeof initConfigInputSchema>;\n\nexport const initConfigInputSchema = z.object({\n  destinationDir: z.string(),\n  templateComplete: z.boolean(),\n  templateData: z\n    .object({\n      ownerName: z.string(),\n      repoName: z.string(),\n      platformName: z.union([z.literal('amd64'), z.literal('arm64')]),\n    })\n    .catchall(z.string()),\n  templateName: z.string(),\n});\n\nexport type InitConfig = z.infer<typeof initConfigSchema>;\n\nconst initConfigSchema = initConfigInputSchema\n  .omit({\n    templateData: true,\n  })\n  .extend({\n    templateData: z\n      .object({\n        ownerName: z.string(),\n        repoName: z.string(),\n\n        // Derived from ownerName\n        // TODO: use zod to transform `InitConfigInput` -> `InitConfig`?\n        orgName: z.string(),\n        teamName: z.string(),\n\n        // Generated by init command\n        port: z.string(),\n      })\n      .catchall(z.string()),\n\n    entryPoint: z.string().optional(),\n    type: projectTypeSchema.optional(),\n  });\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAAkB;AAElB,sBAAkC;AAI3B,MAAM,wBAAwB,aAAE,OAAO;AAAA,EAC5C,gBAAgB,aAAE,OAAO;AAAA,EACzB,kBAAkB,aAAE,QAAQ;AAAA,EAC5B,cAAc,aACX,OAAO;AAAA,IACN,WAAW,aAAE,OAAO;AAAA,IACpB,UAAU,aAAE,OAAO;AAAA,IACnB,cAAc,aAAE,MAAM,CAAC,aAAE,QAAQ,OAAO,GAAG,aAAE,QAAQ,OAAO,CAAC,CAAC;AAAA,EAChE,CAAC,EACA,SAAS,aAAE,OAAO,CAAC;AAAA,EACtB,cAAc,aAAE,OAAO;AACzB,CAAC;AAID,MAAM,mBAAmB,sBACtB,KAAK;AAAA,EACJ,cAAc;AAChB,CAAC,EACA,OAAO;AAAA,EACN,cAAc,aACX,OAAO;AAAA,IACN,WAAW,aAAE,OAAO;AAAA,IACpB,UAAU,aAAE,OAAO;AAAA;AAAA;AAAA,IAInB,SAAS,aAAE,OAAO;AAAA,IAClB,UAAU,aAAE,OAAO;AAAA;AAAA,IAGnB,MAAM,aAAE,OAAO;AAAA,EACjB,CAAC,EACA,SAAS,aAAE,OAAO,CAAC;AAAA,EAEtB,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAChC,MAAM,kCAAkB,SAAS;AACnC,CAAC;",
   "names": []
 }

package/lib/utils/error.d.ts

@@ -1,15 +1,35 @@
 /// <reference types="node" />
 import { inspect } from 'util';
-import * as t from 'runtypes';
-export type ConcurrentlyErrors = t.Static<typeof ConcurrentlyErrors>;
-export declare const ConcurrentlyErrors: t.Array<t.Record<{
-    command: t.Record<{
-        command: t.String;
-        name: t.String;
-    }, false>;
-    index: t.Number;
-    exitCode: t.Number;
-}, false>, false>;
+import { z } from 'zod';
+export type ConcurrentlyErrors = z.infer<typeof concurrentlyErrorsSchema>;
+export declare const concurrentlyErrorsSchema: z.ZodArray<z.ZodObject<{
+    command: z.ZodObject<{
+        command: z.ZodString;
+        name: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        name: string;
+        command: string;
+    }, {
+        name: string;
+        command: string;
+    }>;
+    index: z.ZodNumber;
+    exitCode: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    index: number;
+    exitCode: number;
+    command: {
+        name: string;
+        command: string;
+    };
+}, {
+    index: number;
+    exitCode: number;
+    command: {
+        name: string;
+        command: string;
+    };
+}>, "many">;
 /**
  * Creates an error that returns its plain `message` rather than a full stack
  * trace when `util.inspect`ed.

package/lib/utils/error.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,35 +15,27 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var error_exports = {};
 __export(error_exports, {
-  ConcurrentlyErrors: () => ConcurrentlyErrors,
+  concurrentlyErrorsSchema: () => concurrentlyErrorsSchema,
   createTerseError: () => createTerseError,
   handleCliError: () => handleCliError,
   isErrorWithCode: () => isErrorWithCode
 });
 module.exports = __toCommonJS(error_exports);
 var import_util = require("util");
-var t = __toESM(require("runtypes"));
+var import_zod = require("zod");
 var import_logging = require("./logging");
 var import_validation = require("./validation");
-const ConcurrentlyErrors = t.Array(
-  t.Record({
-    command: t.Record({
-      command: t.String,
-      name: t.String
+const concurrentlyErrorsSchema = import_zod.z.array(
+  import_zod.z.object({
+    command: import_zod.z.object({
+      command: import_zod.z.string(),
+      name: import_zod.z.string()
     }),
-    index: t.Number,
-    exitCode: t.Number
+    index: import_zod.z.number(),
+    exitCode: import_zod.z.number()
   })
 );
 const createTerseError = (message) => Object.assign(new Error(message), {
@@ -64,7 +54,7 @@ const handleCliError = (err) => {
 const isErrorWithCode = (err, code) => (0, import_validation.hasProp)(err, "code") && err.code === code;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ConcurrentlyErrors,
+  concurrentlyErrorsSchema,
   createTerseError,
   handleCliError,
   isErrorWithCode

package/lib/utils/error.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/error.ts"],
-  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport { inspect } from 'util';\n\nimport type { ExecaError } from 'execa';\nimport * as t from 'runtypes';\n\nimport { log } from './logging';\nimport { hasNumberProp, hasProp } from './validation';\n\nexport type ConcurrentlyErrors = t.Static<typeof ConcurrentlyErrors>;\n\nexport const ConcurrentlyErrors = t.Array(\n  t.Record({\n    command: t.Record({\n      command: t.String,\n      name: t.String,\n    }),\n    index: t.Number,\n    exitCode: t.Number,\n  }),\n);\n\n/**\n * Creates an error that returns its plain `message` rather than a full stack\n * trace when `util.inspect`ed.\n *\n * This can be useful for terser handling and logging of known error scenarios\n * that have descriptive messages.\n *\n * https://nodejs.org/api/util.html#custom-inspection-functions-on-objects\n */\nexport const createTerseError = (message?: string) =>\n  Object.assign(new Error(message), {\n    [inspect.custom]: () => message,\n  });\n\nconst isExecaError = (err: unknown): err is ExecaError =>\n  hasNumberProp(err, 'exitCode');\n\nexport const handleCliError = (err: unknown) => {\n  if (isExecaError(err)) {\n    process.exitCode = err.exitCode;\n    return;\n  }\n\n  log.err(inspect(err));\n  process.exitCode = 1;\n  return;\n};\n\nexport const isErrorWithCode = <T>(\n  err: unknown,\n  code: T,\n): err is Record<PropertyKey, unknown> & { code: T } =>\n  hasProp(err, 'code') && err.code === code;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,kBAAwB;AAGxB,QAAmB;AAEnB,qBAAoB;AACpB,wBAAuC;AAIhC,MAAM,qBAAqB,EAAE;AAAA,EAClC,EAAE,OAAO;AAAA,IACP,SAAS,EAAE,OAAO;AAAA,MAChB,SAAS,EAAE;AAAA,MACX,MAAM,EAAE;AAAA,IACV,CAAC;AAAA,IACD,OAAO,EAAE;AAAA,IACT,UAAU,EAAE;AAAA,EACd,CAAC;AACH;AAWO,MAAM,mBAAmB,CAAC,YAC/B,OAAO,OAAO,IAAI,MAAM,OAAO,GAAG;AAAA,EAChC,CAAC,oBAAQ,MAAM,GAAG,MAAM;AAC1B,CAAC;AAEH,MAAM,eAAe,CAAC,YACpB,iCAAc,KAAK,UAAU;AAExB,MAAM,iBAAiB,CAAC,QAAiB;AAC9C,MAAI,aAAa,GAAG,GAAG;AACrB,YAAQ,WAAW,IAAI;AACvB;AAAA,EACF;AAEA,qBAAI,QAAI,qBAAQ,GAAG,CAAC;AACpB,UAAQ,WAAW;AACnB;AACF;AAEO,MAAM,kBAAkB,CAC7B,KACA,aAEA,2BAAQ,KAAK,MAAM,KAAK,IAAI,SAAS;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport type { ExecaError } from 'execa';\nimport { z } from 'zod';\n\nimport { log } from './logging';\nimport { hasNumberProp, hasProp } from './validation';\n\nexport type ConcurrentlyErrors = z.infer<typeof concurrentlyErrorsSchema>;\n\nexport const concurrentlyErrorsSchema = z.array(\n  z.object({\n    command: z.object({\n      command: z.string(),\n      name: z.string(),\n    }),\n    index: z.number(),\n    exitCode: z.number(),\n  }),\n);\n\n/**\n * Creates an error that returns its plain `message` rather than a full stack\n * trace when `util.inspect`ed.\n *\n * This can be useful for terser handling and logging of known error scenarios\n * that have descriptive messages.\n *\n * https://nodejs.org/api/util.html#custom-inspection-functions-on-objects\n */\nexport const createTerseError = (message?: string) =>\n  Object.assign(new Error(message), {\n    [inspect.custom]: () => message,\n  });\n\nconst isExecaError = (err: unknown): err is ExecaError =>\n  hasNumberProp(err, 'exitCode');\n\nexport const handleCliError = (err: unknown) => {\n  if (isExecaError(err)) {\n    process.exitCode = err.exitCode;\n    return;\n  }\n\n  log.err(inspect(err));\n  process.exitCode = 1;\n  return;\n};\n\nexport const isErrorWithCode = <T>(\n  err: unknown,\n  code: T,\n): err is Record<PropertyKey, unknown> & { code: T } =>\n  hasProp(err, 'code') && err.code === code;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAGxB,iBAAkB;AAElB,qBAAoB;AACpB,wBAAuC;AAIhC,MAAM,2BAA2B,aAAE;AAAA,EACxC,aAAE,OAAO;AAAA,IACP,SAAS,aAAE,OAAO;AAAA,MAChB,SAAS,aAAE,OAAO;AAAA,MAClB,MAAM,aAAE,OAAO;AAAA,IACjB,CAAC;AAAA,IACD,OAAO,aAAE,OAAO;AAAA,IAChB,UAAU,aAAE,OAAO;AAAA,EACrB,CAAC;AACH;AAWO,MAAM,mBAAmB,CAAC,YAC/B,OAAO,OAAO,IAAI,MAAM,OAAO,GAAG;AAAA,EAChC,CAAC,oBAAQ,MAAM,GAAG,MAAM;AAC1B,CAAC;AAEH,MAAM,eAAe,CAAC,YACpB,iCAAc,KAAK,UAAU;AAExB,MAAM,iBAAiB,CAAC,QAAiB;AAC9C,MAAI,aAAa,GAAG,GAAG;AACrB,YAAQ,WAAW,IAAI;AACvB;AAAA,EACF;AAEA,qBAAI,QAAI,qBAAQ,GAAG,CAAC;AACpB,UAAQ,WAAW;AACnB;AACF;AAEO,MAAM,kBAAkB,CAC7B,KACA,aAEA,2BAAQ,KAAK,MAAM,KAAK,IAAI,SAAS;",
   "names": []
 }

package/lib/utils/exec.js

@@ -116,11 +116,11 @@ const execConcurrently = async (commands, { maxProcesses, nameLength, outputStre
       }
     ).result;
   } catch (err) {
-    const result = import_error.ConcurrentlyErrors.validate(err);
+    const result = import_error.concurrentlyErrorsSchema.safeParse(err);
     if (!result.success) {
       throw err;
     }
-    const failed = result.value.filter(({ exitCode }) => exitCode !== 0).sort(({ index: indexA }, { index: indexB }) => indexA - indexB).map((subprocess) => subprocess.command.name);
+    const failed = result.data.filter(({ exitCode }) => exitCode !== 0).sort(({ index: indexA }, { index: indexB }) => indexA - indexB).map((subprocess) => subprocess.command.name);
     throw Error(
       `${failed.join(", ")} subprocess${failed.length === 1 ? "" : "es"} failed.`
     );

package/lib/utils/exec.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/exec.ts"],
-  "sourcesContent": ["import { cpus } from 'os';\nimport stream from 'stream';\nimport util from 'util';\n\nimport type { Color } from 'chalk';\nimport concurrently from 'concurrently';\nimport execa, { type ExecaChildProcess } from 'execa';\nimport npmRunPath from 'npm-run-path';\nimport npmWhich from 'npm-which';\n\nimport { ConcurrentlyErrors, isErrorWithCode } from './error';\nimport { log } from './logging';\n\nclass YarnSpamFilter extends stream.Transform {\n  silenced = false;\n\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Yarn spews the entire installed dependency tree after this message\n    if (str.startsWith('info Direct dependencies')) {\n      this.silenced = true;\n    }\n\n    if (\n      !this.silenced &&\n      // This isn't very useful given the command generates a lockfile\n      !str.startsWith('info No lockfile found')\n    ) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nclass YarnWarningFilter extends stream.Transform {\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Filter out annoying deprecation warnings that users can do little about\n    if (!str.startsWith('warning skuba >')) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nexport type Exec = (\n  command: string,\n  ...args: string[]\n) => ExecaChildProcess<string>;\n\ninterface ExecConcurrentlyCommand {\n  command: string;\n  name: string;\n  prefixColor?: typeof Color;\n}\n\ninterface ExecConcurrentlyOptions {\n  /**\n   * The maximum number of processes that can execute concurrently.\n   *\n   * Defaults to the CPU core count.\n   */\n  maxProcesses?: number;\n\n  /**\n   * A set length to pad names to.\n   *\n   * Defaults to the length of the longest command name.\n   */\n  nameLength?: number;\n\n  /**\n   * The stream that logging output will be written to.\n   *\n   * Defaults to `process.stdout`.\n   */\n  outputStream?: stream.Writable;\n}\n\ntype ExecOptions = execa.Options & { streamStdio?: true | 'yarn' };\n\nconst envWithPath = {\n  PATH: npmRunPath({ cwd: __dirname }),\n};\n\nconst runCommand = (command: string, args: string[], opts?: ExecOptions) => {\n  const subprocess = execa(command, args, {\n    localDir: __dirname,\n    preferLocal: true,\n    stdio: 'inherit',\n    ...opts,\n  });\n\n  switch (opts?.streamStdio) {\n    case 'yarn':\n      const stderrFilter = new YarnWarningFilter();\n      const stdoutFilter = new YarnSpamFilter();\n\n      subprocess.stderr?.pipe(stderrFilter).pipe(process.stderr);\n      subprocess.stdout?.pipe(stdoutFilter).pipe(process.stdout);\n\n      break;\n\n    case true:\n      subprocess.stderr?.pipe(process.stderr);\n      subprocess.stdout?.pipe(process.stdout);\n\n      break;\n  }\n\n  return subprocess;\n};\n\nconst whichCallback = npmWhich(__dirname);\n\nconst which = util.promisify<string, string>(whichCallback);\n\nexport const createExec =\n  (opts: ExecOptions): Exec =>\n  (command, ...args) =>\n    runCommand(command, args, opts);\n\nexport const exec: Exec = (command, ...args) => runCommand(command, args);\n\nexport const execConcurrently = async (\n  commands: ExecConcurrentlyCommand[],\n  { maxProcesses, nameLength, outputStream }: ExecConcurrentlyOptions = {},\n) => {\n  const maxNameLength =\n    nameLength ??\n    commands.reduce(\n      (length, command) => Math.max(length, command.name.length),\n      0,\n    );\n\n  try {\n    await concurrently(\n      commands.map(({ command, name, prefixColor }) => ({\n        command,\n        env: envWithPath,\n        name: name.padEnd(maxNameLength),\n        prefixColor,\n      })),\n      {\n        maxProcesses: maxProcesses ?? cpus().length,\n\n        outputStream,\n\n        // Use a minimalist logging prefix.\n        prefix: '{name} \u2502',\n      },\n    ).result;\n  } catch (err) {\n    const result = ConcurrentlyErrors.validate(err);\n\n    if (!result.success) {\n      throw err;\n    }\n\n    const failed = result.value\n      .filter(({ exitCode }) => exitCode !== 0)\n      .sort(({ index: indexA }, { index: indexB }) => indexA - indexB)\n      .map((subprocess) => subprocess.command.name);\n\n    throw Error(\n      `${failed.join(', ')} subprocess${\n        failed.length === 1 ? '' : 'es'\n      } failed.`,\n    );\n  }\n};\n\nexport const ensureCommands = async (...names: string[]) => {\n  let success = true;\n\n  await Promise.all(\n    names.map(async (name) => {\n      const result = await hasCommand(name);\n\n      if (!result) {\n        success = false;\n\n        log.err(log.bold(name), 'needs to be installed.');\n      }\n    }),\n  );\n\n  if (!success) {\n    process.exit(1);\n  }\n};\n\nexport const hasCommand = async (name: string) => {\n  try {\n    await which(name);\n\n    return true;\n  } catch (err) {\n    if (isErrorWithCode(err, 'ENOENT')) {\n      return false;\n    }\n\n    throw err;\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { cpus } from 'os';\nimport stream from 'stream';\nimport util from 'util';\n\nimport type { Color } from 'chalk';\nimport concurrently from 'concurrently';\nimport execa, { type ExecaChildProcess } from 'execa';\nimport npmRunPath from 'npm-run-path';\nimport npmWhich from 'npm-which';\n\nimport { concurrentlyErrorsSchema, isErrorWithCode } from './error';\nimport { log } from './logging';\n\nclass YarnSpamFilter extends stream.Transform {\n  silenced = false;\n\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Yarn spews the entire installed dependency tree after this message\n    if (str.startsWith('info Direct dependencies')) {\n      this.silenced = true;\n    }\n\n    if (\n      !this.silenced &&\n      // This isn't very useful given the command generates a lockfile\n      !str.startsWith('info No lockfile found')\n    ) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nclass YarnWarningFilter extends stream.Transform {\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Filter out annoying deprecation warnings that users can do little about\n    if (!str.startsWith('warning skuba >')) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nexport type Exec = (\n  command: string,\n  ...args: string[]\n) => ExecaChildProcess<string>;\n\ninterface ExecConcurrentlyCommand {\n  command: string;\n  name: string;\n  prefixColor?: typeof Color;\n}\n\ninterface ExecConcurrentlyOptions {\n  /**\n   * The maximum number of processes that can execute concurrently.\n   *\n   * Defaults to the CPU core count.\n   */\n  maxProcesses?: number;\n\n  /**\n   * A set length to pad names to.\n   *\n   * Defaults to the length of the longest command name.\n   */\n  nameLength?: number;\n\n  /**\n   * The stream that logging output will be written to.\n   *\n   * Defaults to `process.stdout`.\n   */\n  outputStream?: stream.Writable;\n}\n\ntype ExecOptions = execa.Options & { streamStdio?: true | 'yarn' };\n\nconst envWithPath = {\n  PATH: npmRunPath({ cwd: __dirname }),\n};\n\nconst runCommand = (command: string, args: string[], opts?: ExecOptions) => {\n  const subprocess = execa(command, args, {\n    localDir: __dirname,\n    preferLocal: true,\n    stdio: 'inherit',\n    ...opts,\n  });\n\n  switch (opts?.streamStdio) {\n    case 'yarn':\n      const stderrFilter = new YarnWarningFilter();\n      const stdoutFilter = new YarnSpamFilter();\n\n      subprocess.stderr?.pipe(stderrFilter).pipe(process.stderr);\n      subprocess.stdout?.pipe(stdoutFilter).pipe(process.stdout);\n\n      break;\n\n    case true:\n      subprocess.stderr?.pipe(process.stderr);\n      subprocess.stdout?.pipe(process.stdout);\n\n      break;\n  }\n\n  return subprocess;\n};\n\nconst whichCallback = npmWhich(__dirname);\n\nconst which = util.promisify<string, string>(whichCallback);\n\nexport const createExec =\n  (opts: ExecOptions): Exec =>\n  (command, ...args) =>\n    runCommand(command, args, opts);\n\nexport const exec: Exec = (command, ...args) => runCommand(command, args);\n\nexport const execConcurrently = async (\n  commands: ExecConcurrentlyCommand[],\n  { maxProcesses, nameLength, outputStream }: ExecConcurrentlyOptions = {},\n) => {\n  const maxNameLength =\n    nameLength ??\n    commands.reduce(\n      (length, command) => Math.max(length, command.name.length),\n      0,\n    );\n\n  try {\n    await concurrently(\n      commands.map(({ command, name, prefixColor }) => ({\n        command,\n        env: envWithPath,\n        name: name.padEnd(maxNameLength),\n        prefixColor,\n      })),\n      {\n        maxProcesses: maxProcesses ?? cpus().length,\n\n        outputStream,\n\n        // Use a minimalist logging prefix.\n        prefix: '{name} \u2502',\n      },\n    ).result;\n  } catch (err) {\n    const result = concurrentlyErrorsSchema.safeParse(err);\n\n    if (!result.success) {\n      throw err;\n    }\n\n    const failed = result.data\n      .filter(({ exitCode }) => exitCode !== 0)\n      .sort(({ index: indexA }, { index: indexB }) => indexA - indexB)\n      .map((subprocess) => subprocess.command.name);\n\n    throw Error(\n      `${failed.join(', ')} subprocess${\n        failed.length === 1 ? '' : 'es'\n      } failed.`,\n    );\n  }\n};\n\nexport const ensureCommands = async (...names: string[]) => {\n  let success = true;\n\n  await Promise.all(\n    names.map(async (name) => {\n      const result = await hasCommand(name);\n\n      if (!result) {\n        success = false;\n\n        log.err(log.bold(name), 'needs to be installed.');\n      }\n    }),\n  );\n\n  if (!success) {\n    process.exit(1);\n  }\n};\n\nexport const hasCommand = async (name: string) => {\n  try {\n    await which(name);\n\n    return true;\n  } catch (err) {\n    if (isErrorWithCode(err, 'ENOENT')) {\n      return false;\n    }\n\n    throw err;\n  }\n};\n"],
+  "mappings": "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",
   "names": ["stream", "npmRunPath", "execa", "npmWhich", "util", "concurrently"]
 }

package/lib/utils/manifest.d.ts

@@ -1,7 +1,7 @@
 import readPkgUp, { type NormalizedPackageJson } from 'read-pkg-up';
-import * as t from 'runtypes';
-export type ProjectType = t.Static<typeof ProjectType>;
-export declare const ProjectType: t.Union<[t.Literal<"application">, t.Literal<"package">]>;
+import { z } from 'zod';
+export type ProjectType = z.infer<typeof projectTypeSchema>;
+export declare const projectTypeSchema: z.ZodUnion<[z.ZodLiteral<"application">, z.ZodLiteral<"package">]>;
 export declare const PROJECT_TYPES: readonly ["application", "package"];
 export declare const getSkubaManifest: () => Promise<NormalizedPackageJson>;
 export declare const getConsumerManifest: () => Promise<readPkgUp.NormalizedReadResult | undefined>;

package/lib/utils/manifest.js

@@ -29,21 +29,21 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var manifest_exports = {};
 __export(manifest_exports, {
   PROJECT_TYPES: () => PROJECT_TYPES,
-  ProjectType: () => ProjectType,
   getConsumerManifest: () => getConsumerManifest,
   getEntryPointFromManifest: () => getEntryPointFromManifest,
   getPropFromConsumerManifest: () => getPropFromConsumerManifest,
   getSkubaManifest: () => getSkubaManifest,
-  getStringPropFromConsumerManifest: () => getStringPropFromConsumerManifest
+  getStringPropFromConsumerManifest: () => getStringPropFromConsumerManifest,
+  projectTypeSchema: () => projectTypeSchema
 });
 module.exports = __toCommonJS(manifest_exports);
 var import_read_pkg_up = __toESM(require("read-pkg-up"));
-var t = __toESM(require("runtypes"));
+var import_zod = require("zod");
 var import_validation = require("./validation");
-const ProjectType = t.Union(
-  t.Literal("application"),
-  t.Literal("package")
-);
+const projectTypeSchema = import_zod.z.union([
+  import_zod.z.literal("application"),
+  import_zod.z.literal("package")
+]);
 const PROJECT_TYPES = ["application", "package"];
 const DEFAULT_ENTRY_POINT = "src/app.ts";
 let skubaManifest;
@@ -73,11 +73,11 @@ const getEntryPointFromManifest = async () => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PROJECT_TYPES,
-  ProjectType,
   getConsumerManifest,
   getEntryPointFromManifest,
   getPropFromConsumerManifest,
   getSkubaManifest,
-  getStringPropFromConsumerManifest
+  getStringPropFromConsumerManifest,
+  projectTypeSchema
 });
 //# sourceMappingURL=manifest.js.map

package/lib/utils/manifest.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/manifest.ts"],
-  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport readPkgUp, { type NormalizedPackageJson } from 'read-pkg-up';\nimport * as t from 'runtypes';\n\nimport { hasProp } from './validation';\n\nexport type ProjectType = t.Static<typeof ProjectType>;\n\nexport const ProjectType = t.Union(\n  t.Literal('application'),\n  t.Literal('package'),\n);\n\nexport const PROJECT_TYPES = ['application', 'package'] as const;\n\nconst DEFAULT_ENTRY_POINT = 'src/app.ts';\n\nlet skubaManifest: NormalizedPackageJson | undefined;\n\nexport const getSkubaManifest = async (): Promise<NormalizedPackageJson> => {\n  if (skubaManifest !== undefined) {\n    return skubaManifest;\n  }\n\n  const result = await readPkgUp({ cwd: __dirname });\n\n  if (result === undefined) {\n    throw Error('skuba could not find its own manifest');\n  }\n\n  return (skubaManifest = result.packageJson);\n};\n\nexport const getConsumerManifest = () => readPkgUp();\n\nexport const getPropFromConsumerManifest = async <\n  T extends string,\n  V = unknown,\n>(\n  prop: T,\n): Promise<V | undefined> => {\n  const result = await getConsumerManifest();\n\n  return result !== undefined && hasProp<T, V>(result.packageJson.skuba, prop)\n    ? result.packageJson.skuba[prop]\n    : undefined;\n};\n\nexport const getStringPropFromConsumerManifest = async <T extends string>(\n  prop: T,\n): Promise<string | undefined> => {\n  const result = await getPropFromConsumerManifest(prop);\n\n  return typeof result === 'string' ? result : undefined;\n};\n\nexport const getEntryPointFromManifest = async (): Promise<string> => {\n  const entryPoint = await getStringPropFromConsumerManifest('entryPoint');\n\n  return entryPoint ?? DEFAULT_ENTRY_POINT;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAAsD;AACtD,QAAmB;AAEnB,wBAAwB;AAIjB,MAAM,cAAc,EAAE;AAAA,EAC3B,EAAE,QAAQ,aAAa;AAAA,EACvB,EAAE,QAAQ,SAAS;AACrB;AAEO,MAAM,gBAAgB,CAAC,eAAe,SAAS;AAEtD,MAAM,sBAAsB;AAE5B,IAAI;AAEG,MAAM,mBAAmB,YAA4C;AAC1E,MAAI,kBAAkB,QAAW;AAC/B,WAAO;AAAA,EACT;AAEA,QAAM,SAAS,UAAM,mBAAAA,SAAU,EAAE,KAAK,UAAU,CAAC;AAEjD,MAAI,WAAW,QAAW;AACxB,UAAM,MAAM,uCAAuC;AAAA,EACrD;AAEA,SAAQ,gBAAgB,OAAO;AACjC;AAEO,MAAM,sBAAsB,UAAM,mBAAAA,SAAU;AAE5C,MAAM,8BAA8B,OAIzC,SAC2B;AAC3B,QAAM,SAAS,MAAM,oBAAoB;AAEzC,SAAO,WAAW,cAAa,2BAAc,OAAO,YAAY,OAAO,IAAI,IACvE,OAAO,YAAY,MAAM,IAAI,IAC7B;AACN;AAEO,MAAM,oCAAoC,OAC/C,SACgC;AAChC,QAAM,SAAS,MAAM,4BAA4B,IAAI;AAErD,SAAO,OAAO,WAAW,WAAW,SAAS;AAC/C;AAEO,MAAM,4BAA4B,YAA6B;AACpE,QAAM,aAAa,MAAM,kCAAkC,YAAY;AAEvE,SAAO,cAAc;AACvB;",
+  "sourcesContent": ["import readPkgUp, { type NormalizedPackageJson } from 'read-pkg-up';\nimport { z } from 'zod';\n\nimport { hasProp } from './validation';\n\nexport type ProjectType = z.infer<typeof projectTypeSchema>;\n\nexport const projectTypeSchema = z.union([\n  z.literal('application'),\n  z.literal('package'),\n]);\n\nexport const PROJECT_TYPES = ['application', 'package'] as const;\n\nconst DEFAULT_ENTRY_POINT = 'src/app.ts';\n\nlet skubaManifest: NormalizedPackageJson | undefined;\n\nexport const getSkubaManifest = async (): Promise<NormalizedPackageJson> => {\n  if (skubaManifest !== undefined) {\n    return skubaManifest;\n  }\n\n  const result = await readPkgUp({ cwd: __dirname });\n\n  if (result === undefined) {\n    throw Error('skuba could not find its own manifest');\n  }\n\n  return (skubaManifest = result.packageJson);\n};\n\nexport const getConsumerManifest = () => readPkgUp();\n\nexport const getPropFromConsumerManifest = async <\n  T extends string,\n  V = unknown,\n>(\n  prop: T,\n): Promise<V | undefined> => {\n  const result = await getConsumerManifest();\n\n  return result !== undefined && hasProp<T, V>(result.packageJson.skuba, prop)\n    ? result.packageJson.skuba[prop]\n    : undefined;\n};\n\nexport const getStringPropFromConsumerManifest = async <T extends string>(\n  prop: T,\n): Promise<string | undefined> => {\n  const result = await getPropFromConsumerManifest(prop);\n\n  return typeof result === 'string' ? result : undefined;\n};\n\nexport const getEntryPointFromManifest = async (): Promise<string> => {\n  const entryPoint = await getStringPropFromConsumerManifest('entryPoint');\n\n  return entryPoint ?? DEFAULT_ENTRY_POINT;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAsD;AACtD,iBAAkB;AAElB,wBAAwB;AAIjB,MAAM,oBAAoB,aAAE,MAAM;AAAA,EACvC,aAAE,QAAQ,aAAa;AAAA,EACvB,aAAE,QAAQ,SAAS;AACrB,CAAC;AAEM,MAAM,gBAAgB,CAAC,eAAe,SAAS;AAEtD,MAAM,sBAAsB;AAE5B,IAAI;AAEG,MAAM,mBAAmB,YAA4C;AAC1E,MAAI,kBAAkB,QAAW;AAC/B,WAAO;AAAA,EACT;AAEA,QAAM,SAAS,UAAM,mBAAAA,SAAU,EAAE,KAAK,UAAU,CAAC;AAEjD,MAAI,WAAW,QAAW;AACxB,UAAM,MAAM,uCAAuC;AAAA,EACrD;AAEA,SAAQ,gBAAgB,OAAO;AACjC;AAEO,MAAM,sBAAsB,UAAM,mBAAAA,SAAU;AAE5C,MAAM,8BAA8B,OAIzC,SAC2B;AAC3B,QAAM,SAAS,MAAM,oBAAoB;AAEzC,SAAO,WAAW,cAAa,2BAAc,OAAO,YAAY,OAAO,IAAI,IACvE,OAAO,YAAY,MAAM,IAAI,IAC7B;AACN;AAEO,MAAM,oCAAoC,OAC/C,SACgC;AAChC,QAAM,SAAS,MAAM,4BAA4B,IAAI;AAErD,SAAO,OAAO,WAAW,WAAW,SAAS;AAC/C;AAEO,MAAM,4BAA4B,YAA6B;AACpE,QAAM,aAAa,MAAM,kCAAkC,YAAY;AAEvE,SAAO,cAAc;AACvB;",
   "names": ["readPkgUp"]
 }

package/lib/utils/template.d.ts

@@ -1,4 +1,4 @@
-import * as t from 'runtypes';
+import { z } from 'zod';
 export declare const TEMPLATE_NAMES: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package"];
 export type TemplateName = (typeof TEMPLATE_NAMES)[number];
 export declare const TEMPLATE_NAMES_WITH_BYO: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package", "github →"];
@@ -17,18 +17,48 @@ interface TemplateDocumentationConfig {
     filename: string;
 }
 export declare const TEMPLATE_DOCUMENTATION_CONFIG: Record<TemplateName, TemplateDocumentationConfig>;
-export type TemplateConfig = t.Static<typeof TemplateConfig>;
-export declare const TemplateConfig: t.Record<{
-    fields: t.Array<t.Record<{
-        name: t.String;
-        message: t.String;
-        initial: t.String;
-        validate: t.Optional<t.Function>;
-    }, false>, false>;
-    entryPoint: t.Optional<t.String>;
-    noSkip: t.Optional<t.Boolean>;
-    type: t.Optional<t.Union<[t.Literal<"application">, t.Literal<"package">]>>;
-}, false>;
+export type TemplateConfig = z.infer<typeof templateConfigSchema>;
+export declare const templateConfigSchema: z.ZodObject<{
+    fields: z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        message: z.ZodString;
+        initial: z.ZodString;
+        validate: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodString], z.ZodUnknown>, z.ZodUnion<[z.ZodBoolean, z.ZodString]>>>;
+    }, "strip", z.ZodTypeAny, {
+        message: string;
+        name: string;
+        initial: string;
+        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+    }, {
+        message: string;
+        name: string;
+        initial: string;
+        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+    }>, "many">;
+    entryPoint: z.ZodOptional<z.ZodString>;
+    noSkip: z.ZodOptional<z.ZodBoolean>;
+    type: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"application">, z.ZodLiteral<"package">]>>;
+}, "strip", z.ZodTypeAny, {
+    fields: {
+        message: string;
+        name: string;
+        initial: string;
+        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+    }[];
+    entryPoint?: string | undefined;
+    noSkip?: boolean | undefined;
+    type?: "package" | "application" | undefined;
+}, {
+    fields: {
+        message: string;
+        name: string;
+        initial: string;
+        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+    }[];
+    entryPoint?: string | undefined;
+    noSkip?: boolean | undefined;
+    type?: "package" | "application" | undefined;
+}>;
 export declare const TEMPLATE_CONFIG_FILENAME = "skuba.template.js";
 export declare const TEMPLATE_DIR: string;
 export declare const BASE_TEMPLATE_DIR: string;

package/lib/utils/template.js

@@ -34,14 +34,14 @@ __export(template_exports, {
   TEMPLATE_DOCUMENTATION_CONFIG: () => TEMPLATE_DOCUMENTATION_CONFIG,
   TEMPLATE_NAMES: () => TEMPLATE_NAMES,
   TEMPLATE_NAMES_WITH_BYO: () => TEMPLATE_NAMES_WITH_BYO,
-  TemplateConfig: () => TemplateConfig,
   ensureTemplateConfigDeletion: () => ensureTemplateConfigDeletion,
-  readBaseTemplateFile: () => readBaseTemplateFile
+  readBaseTemplateFile: () => readBaseTemplateFile,
+  templateConfigSchema: () => templateConfigSchema
 });
 module.exports = __toCommonJS(template_exports);
 var import_path = __toESM(require("path"));
 var import_fs_extra = __toESM(require("fs-extra"));
-var t = __toESM(require("runtypes"));
+var import_zod = require("zod");
 var import_manifest = require("./manifest");
 const TEMPLATE_NAMES = [
   "express-rest-api",
@@ -83,18 +83,18 @@ const TEMPLATE_DOCUMENTATION_CONFIG = {
     filename: "package.md"
   }
 };
-const TemplateConfig = t.Record({
-  fields: t.Array(
-    t.Record({
-      name: t.String,
-      message: t.String,
-      initial: t.String,
-      validate: t.Function.optional()
+const templateConfigSchema = import_zod.z.object({
+  fields: import_zod.z.array(
+    import_zod.z.object({
+      name: import_zod.z.string(),
+      message: import_zod.z.string(),
+      initial: import_zod.z.string(),
+      validate: import_zod.z.function().args(import_zod.z.string()).returns(import_zod.z.union([import_zod.z.boolean(), import_zod.z.string()])).optional()
     })
   ),
-  entryPoint: t.String.optional(),
-  noSkip: t.Boolean.optional(),
-  type: import_manifest.ProjectType.optional()
+  entryPoint: import_zod.z.string().optional(),
+  noSkip: import_zod.z.boolean().optional(),
+  type: import_manifest.projectTypeSchema.optional()
 });
 const TEMPLATE_CONFIG_FILENAME = "skuba.template.js";
 const TEMPLATE_DIR = import_path.default.join(__dirname, "..", "..", "template");
@@ -109,8 +109,8 @@ const readBaseTemplateFile = (src) => import_fs_extra.default.promises.readFile(
   TEMPLATE_DOCUMENTATION_CONFIG,
   TEMPLATE_NAMES,
   TEMPLATE_NAMES_WITH_BYO,
-  TemplateConfig,
   ensureTemplateConfigDeletion,
-  readBaseTemplateFile
+  readBaseTemplateFile,
+  templateConfigSchema
 });
 //# sourceMappingURL=template.js.map