fix: runtypes ^6.0.0 (#406)

Author: 72636c

.changeset/popular-shoes-serve.md

@@ -0,0 +1,5 @@
+---
+'skuba': patch
+---
+
+**deps:** runtypes ^6.0.0

.changeset/thick-kids-hope.md

@@ -84,7 +84,7 @@
     "picomatch": "^2.2.2",
     "prettier": "2.2.1",
     "read-pkg-up": "^7.0.1",
-    "runtypes": "^5.0.1",
+    "runtypes": "^6.0.0",
     "semantic-release": "^17.3.8",
     "serialize-error": "^8.0.1",
     "source-map-support": "^0.5.19",

package.json

@@ -251,11 +251,7 @@ const configureFromPipe = async (): Promise<InitConfig> => {
 
   if (!result.success) {
     log.err('Invalid data from stdin:');
-    log.err(
-      typeof result.key === 'undefined'
-        ? result.message
-        : `${result.key}: ${result.message}`,
-    );
+    log.err(result.message);
     process.exit(1);
   }
 

src/cli/init/getConfig.ts

@@ -12,7 +12,7 @@ const INIT_CONFIG_INPUT_FIELDS = {
       ownerName: t.String,
       repoName: t.String,
     })
-    .And(t.Dictionary(t.String, 'string')),
+    .And(t.Dictionary(t.String, t.String)),
   templateName: t.String,
 };
 
@@ -22,30 +22,23 @@ export const InitConfigInput = t.Record(INIT_CONFIG_INPUT_FIELDS);
 
 export type InitConfig = t.Static<typeof InitConfig>;
 
-/**
- * TODO: migrate from `t.Partial` to `.optional()` once Runtypes 6 is released.
- */
-const InitConfig = t
-  .Record({
-    ...INIT_CONFIG_INPUT_FIELDS,
-
-    templateData: t
-      .Record({
-        ownerName: t.String,
-        repoName: t.String,
-
-        // Derived from ownerName
-        orgName: t.String,
-        teamName: t.String,
-
-        // Generated by init command
-        port: t.String,
-      })
-      .And(t.Dictionary(t.String, 'string')),
-  })
-  .And(
-    t.Partial({
-      entryPoint: t.String,
-      type: ProjectType,
-    }),
-  );
+const InitConfig = t.Record({
+  ...INIT_CONFIG_INPUT_FIELDS,
+
+  templateData: t
+    .Record({
+      ownerName: t.String,
+      repoName: t.String,
+
+      // Derived from ownerName
+      orgName: t.String,
+      teamName: t.String,
+
+      // Generated by init command
+      port: t.String,
+    })
+    .And(t.Dictionary(t.String, t.String)),
+
+  entryPoint: t.String.optional(),
+  type: ProjectType.optional(),
+});

src/cli/init/types.ts

@@ -9,32 +9,19 @@ import { ProjectType } from './manifest';
 
 export type TemplateConfig = t.Static<typeof TemplateConfig>;
 
-/**
- * TODO: migrate from `t.Partial` to `.optional()` once Runtypes 6 is released.
- */
-export const TemplateConfig = t
-  .Record({
-    fields: t.Array(
-      t
-        .Record({
-          name: t.String,
-          message: t.String,
-          initial: t.String,
-        })
-        .And(
-          t.Partial({
-            validate: t.Function,
-          }),
-        ),
-    ),
-  })
-  .And(
-    t.Partial({
-      entryPoint: t.String,
-      noSkip: t.Boolean,
-      type: ProjectType,
+export const TemplateConfig = t.Record({
+  fields: t.Array(
+    t.Record({
+      name: t.String,
+      message: t.String,
+      initial: t.String,
+      validate: t.Function.optional(),
     }),
-  );
+  ),
+  entryPoint: t.String.optional(),
+  noSkip: t.Boolean.optional(),
+  type: ProjectType.optional(),
+});
 
 export const TEMPLATE_CONFIG_FILENAME = 'skuba.template.js';
 

src/utils/template.ts

@@ -8554,10 +8554,10 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-runtypes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/runtypes/-/runtypes-5.0.1.tgz#406d140410266f6ece17c3501a37234f91faa346"
-  integrity sha512-+TWVlCmFsgrG4Nd2u+ambpNFO8Yp4heAflGQi9oNj6GRkxZo8aSDBxO1Y0vlKIQCWKKFxato+8Hn67XeAqKhRA==
+runtypes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/runtypes/-/runtypes-6.0.0.tgz#0010e7e050a41d4ab38b6138051dfb8774a53f07"
+  integrity sha512-hVBZ2S0i9MmyViSpwCU7TGFuEZxjPIeTMbhCpz59/8C3IGbPL6N03bIVALGfVWZQ+MTXORjWpWnZUP3hPyw96w==
 
 rxjs@^6.6.3:
   version "6.6.6"