create-typescript-app 2.31.0 → 2.33.0

package/lib/blocks/blockCSpell.js

@@ -1,3 +1,4 @@
+import JSON5 from "json5";
 import { getObjectStringsDeep } from "object-strings-deep";
 import { z } from "zod";
 import { base } from "../base.js";
@@ -8,18 +9,32 @@ import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVSCode } from "./blockVSCode.js";
+import { intakeFile } from "./intake/intakeFile.js";
 import { CommandPhase } from "./phases.js";
 const filesGlob = `"**" ".github/**/*"`;
+const addons = {
+  ignores: z.array(z.string()).default([]),
+  words: z.array(z.string()).default([])
+};
+const zAddons = z.object(addons);
 const blockCSpell = base.createBlock({
   about: {
     name: "CSpell"
   },
-  addons: {
-    ignores: z.array(z.string()).default([]),
-    words: z.array(z.string()).default([])
+  addons,
+  intake({ files }) {
+    const cspellJson = intakeFile(files, ["cspell.json"]);
+    if (!cspellJson) {
+      return void 0;
+    }
+    const { data } = zAddons.safeParse(JSON5.parse(cspellJson[0]));
+    if (!data) {
+      return void 0;
+    }
+    return data;
   },
-  produce({ addons, options }) {
-    const { ignores, words } = addons;
+  produce({ addons: addons2, options }) {
+    const { ignores, words } = addons2;
     const allWords = Array.from(
       /* @__PURE__ */ new Set([...options.words ?? [], ...words])
     ).sort();

package/lib/blocks/blockESLint.d.ts

@@ -9,7 +9,6 @@ declare const blockESLint: bingo_stratum.BlockWithAddons<{
         specifier: string;
         types?: boolean | undefined;
     }[];
-    ignores: string[];
     extensions: (string | {
         files?: string[] | undefined;
         rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
@@ -22,6 +21,7 @@ declare const blockESLint: bingo_stratum.BlockWithAddons<{
         linterOptions?: unknown;
         plugins?: Record<string, string> | undefined;
     })[];
+    ignores: string[];
     explanations: string[];
     rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
         entries: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]>;

package/lib/blocks/blockGitHubActionsCI.d.ts

@@ -38,8 +38,8 @@ declare const blockGitHubActionsCI: bingo_stratum.BlockWithAddons<{
         } | {
             uses: string;
         }))[];
-        checkoutWith?: Record<string, string> | undefined;
         if?: string | undefined;
+        checkoutWith?: Record<string, string> | undefined;
     }[] | undefined;
 }, {
     access: "public" | "restricted";

package/lib/blocks/blockPackageJson.d.ts

@@ -50,6 +50,7 @@ declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
             url?: string | undefined;
             email?: string | undefined;
         })[] | undefined;
+        publishConfig?: Record<string, unknown> | undefined;
         main?: string | undefined;
         types?: string | undefined;
         bugs?: string | {
@@ -65,7 +66,6 @@ declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
         overrides?: Record<string, unknown> | undefined;
         os?: string[] | undefined;
         cpu?: string[] | undefined;
-        publishConfig?: Record<string, unknown> | undefined;
         workspaces?: string[] | undefined;
         deprecated?: string | undefined;
         typings?: string | undefined;

package/lib/blocks/blockReleaseIt.d.ts

@@ -2,8 +2,8 @@ import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockReleaseIt: bingo_stratum.BlockWithAddons<{
     builders: {
-        run: string;
         order: number;
+        run: string;
     }[];
 }, {
     access: "public" | "restricted";

package/lib/blocks/blockTypeScript.js

@@ -1,3 +1,4 @@
+import JSON5 from "json5";
 import sortKeys from "sort-keys";
 import { CompilerOptionsSchema } from "zod-tsconfig";
 import { base } from "../base.js";
@@ -13,6 +14,7 @@ import { blockPackageJson } from "./blockPackageJson.js";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVitest } from "./blockVitest.js";
 import { blockVSCode } from "./blockVSCode.js";
+import { intakeFile } from "./intake/intakeFile.js";
 const blockTypeScript = base.createBlock({
   about: {
     name: "TypeScript"
@@ -20,6 +22,20 @@ const blockTypeScript = base.createBlock({
   addons: {
     compilerOptions: CompilerOptionsSchema.optional()
   },
+  intake({ files }) {
+    const tsconfig = intakeFile(files, ["tsconfig.json"]);
+    if (!tsconfig) {
+      return void 0;
+    }
+    const raw = JSON5.parse(tsconfig[0]);
+    const { data } = CompilerOptionsSchema.safeParse(raw?.compilerOptions);
+    if (!data) {
+      return void 0;
+    }
+    return {
+      compilerOptions: data
+    };
+  },
   produce({ addons, options }) {
     const { compilerOptions } = addons;
     const primaryBin = getPrimaryBin(options.bin, options.repository);

package/lib/blocks/blockVitest.d.ts

@@ -2,6 +2,10 @@ import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockVitest: bingo_stratum.BlockWithAddons<{
     exclude: string[];
+    coverage: {
+        exclude?: string[] | undefined;
+        include?: string[] | undefined;
+    };
     actionSteps: ({
         with?: Record<string, string> | undefined;
         env?: Record<string, string> | undefined;
@@ -11,10 +15,6 @@ declare const blockVitest: bingo_stratum.BlockWithAddons<{
     } | {
         uses: string;
     }))[];
-    coverage: {
-        exclude?: string[] | undefined;
-        include?: string[] | undefined;
-    };
     flags: string[];
     environment?: string | undefined;
 }, {

package/lib/blocks/index.d.ts

@@ -554,7 +554,6 @@ declare const blocks: {
             specifier: string;
             types?: boolean | undefined;
         }[];
-        ignores: string[];
         extensions: (string | {
             files?: string[] | undefined;
             rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
@@ -567,6 +566,7 @@ declare const blocks: {
             linterOptions?: unknown;
             plugins?: Record<string, string> | undefined;
         })[];
+        ignores: string[];
         explanations: string[];
         rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
             entries: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]>;
@@ -1470,8 +1470,8 @@ declare const blocks: {
             } | {
                 uses: string;
             }))[];
-            checkoutWith?: Record<string, string> | undefined;
             if?: string | undefined;
+            checkoutWith?: Record<string, string> | undefined;
         }[] | undefined;
     }, {
         access: "public" | "restricted";
@@ -2216,6 +2216,7 @@ declare const blocks: {
                 url?: string | undefined;
                 email?: string | undefined;
             })[] | undefined;
+            publishConfig?: Record<string, unknown> | undefined;
             main?: string | undefined;
             types?: string | undefined;
             bugs?: string | {
@@ -2231,7 +2232,6 @@ declare const blocks: {
             overrides?: Record<string, unknown> | undefined;
             os?: string[] | undefined;
             cpu?: string[] | undefined;
-            publishConfig?: Record<string, unknown> | undefined;
             workspaces?: string[] | undefined;
             deprecated?: string | undefined;
             typings?: string | undefined;
@@ -2811,8 +2811,8 @@ declare const blocks: {
     }>;
     blockReleaseIt: bingo_stratum.BlockWithAddons<{
         builders: {
-            run: string;
             order: number;
+            run: string;
         }[];
     }, {
         access: "public" | "restricted";
@@ -3340,6 +3340,10 @@ declare const blocks: {
     }>;
     blockVitest: bingo_stratum.BlockWithAddons<{
         exclude: string[];
+        coverage: {
+            exclude?: string[] | undefined;
+            include?: string[] | undefined;
+        };
         actionSteps: ({
             with?: Record<string, string> | undefined;
             env?: Record<string, string> | undefined;
@@ -3349,10 +3353,6 @@ declare const blocks: {
         } | {
             uses: string;
         }))[];
-        coverage: {
-            exclude?: string[] | undefined;
-            include?: string[] | undefined;
-        };
         flags: string[];
         environment?: string | undefined;
     }, {

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.30.0";
+var version = "2.32.0";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.31.0",
+	"version": "2.33.0",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",