create-typescript-app 2.15.6 → 2.16.0

package/lib/base.d.ts

@@ -13,16 +13,16 @@ declare const base: bingo_stratum.Base<{
         name: z.ZodString;
         profile: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        name: string;
         avatar_url: string;
         contributions: string[];
         login: string;
+        name: string;
         profile: string;
     }, {
-        name: string;
         avatar_url: string;
         contributions: string[];
         login: string;
+        name: string;
         profile: string;
     }>, "many">>;
     description: z.ZodDefault<z.ZodString>;
@@ -64,11 +64,11 @@ declare const base: bingo_stratum.Base<{
         href: z.ZodString;
         title: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        title: string;
         href: string;
-    }, {
         title: string;
+    }, {
         href: string;
+        title: string;
     }>>;
     keywords: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     logo: z.ZodOptional<z.ZodObject<{

package/lib/blocks/blockMain.d.ts

@@ -0,0 +1,66 @@
+import * as bingo_stratum from 'bingo-stratum';
+
+declare const blockMain: bingo_stratum.BlockWithAddons<{
+    runArgs: string[];
+    filePath?: string | undefined;
+}, {
+    access: "public" | "restricted";
+    description: string;
+    directory: string;
+    email: {
+        github: string;
+        npm: string;
+    };
+    title: string;
+    owner: string;
+    repository: string;
+    author?: string | undefined;
+    bin?: string | Record<string, string> | undefined;
+    contributors?: {
+        avatar_url: string;
+        contributions: string[];
+        login: string;
+        name: string;
+        profile: string;
+    }[] | undefined;
+    documentation?: string | undefined;
+    emoji?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
+    explainer?: string[] | undefined;
+    funding?: string | undefined;
+    guide?: {
+        href: string;
+        title: string;
+    } | undefined;
+    keywords?: string[] | undefined;
+    logo?: {
+        alt: string;
+        src: string;
+        height?: number | undefined;
+        width?: number | undefined;
+    } | undefined;
+    node?: {
+        minimum: string;
+        pinned?: string | undefined;
+    } | undefined;
+    packageData?: {
+        dependencies?: Record<string, string> | undefined;
+        devDependencies?: Record<string, string> | undefined;
+        scripts?: Record<string, string> | undefined;
+    } | undefined;
+    pnpm?: string | undefined;
+    rulesetId?: string | undefined;
+    usage?: string | undefined;
+    version?: string | undefined;
+    words?: string[] | undefined;
+    workflowsVersions?: Record<string, Record<string, {
+        pinned?: boolean | undefined;
+        hash?: string | undefined;
+    }>> | undefined;
+}>;
+
+export { blockMain };

package/lib/blocks/blockMain.js

@@ -0,0 +1,33 @@
+import { z } from "zod";
+import { base } from "../base.js";
+import { blockPackageJson } from "./blockPackageJson.js";
+import { blockTSup } from "./blockTSup.js";
+const blockMain = base.createBlock({
+  about: {
+    name: "Main"
+  },
+  addons: {
+    filePath: z.string().optional(),
+    runArgs: z.array(z.string()).default([])
+  },
+  produce({ addons }) {
+    const { filePath = "lib/index.js", runArgs } = addons;
+    return {
+      addons: [
+        blockPackageJson({
+          properties: {
+            main: filePath
+          }
+        }),
+        blockTSup({
+          runInCI: [
+            `node ${filePath}${runArgs.map((arg) => ` ${arg}`).join("")}`
+          ]
+        })
+      ]
+    };
+  }
+});
+export {
+  blockMain
+};

package/lib/blocks/blockPackageJson.js

@@ -1,4 +1,3 @@
-import * as htmlToText from "html-to-text";
 import removeUndefinedObjects from "remove-undefined-objects";
 import semver from "semver";
 import sortPackageJson from "sort-package-json";
@@ -6,6 +5,7 @@ import { z } from "zod";
 import { PackageJson } from "zod-package-json";
 import { base } from "../base.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
+import { htmlToTextSafe } from "./html/htmlToTextSafe.js";
 import { CommandPhase } from "./phases.js";
 const PackageJsonWithNullableScripts = PackageJson.partial().extend({
   scripts: z.record(z.string(), z.union([z.string(), z.undefined()])).optional()
@@ -30,9 +30,7 @@ const blockPackageJson = base.createBlock({
         ...addons.properties.devDependencies
       }
     );
-    const description = htmlToText.convert(options.description, {
-      wordwrap: false
-    });
+    const description = htmlToTextSafe(options.description);
     return {
       files: {
         "package.json": sortPackageJson(
@@ -62,7 +60,6 @@ const blockPackageJson = base.createBlock({
                 (keyword) => keyword.split(/ /)
               ),
               license: "MIT",
-              main: "lib/index.js",
               name: options.repository,
               repository: {
                 type: "git",
@@ -103,13 +100,15 @@ function collectBinFiles(bin) {
   return files.map((file) => file.replace(/^\.\//, ""));
 }
 function removeRangePrefix(version) {
-  return version.replaceAll(/[\^~><=]/gu, "").split(" ")[0];
+  const raw = version.replaceAll(/[\^~><=]/gu, "").split(" ")[0];
+  return semver.coerce(raw) ?? raw;
 }
 function useLargerVersion(existing, replacement) {
-  if (!existing) {
+  if (!existing || existing === replacement) {
     return replacement;
   }
-  return semver.gt(removeRangePrefix(existing), removeRangePrefix(replacement)) ? existing : replacement;
+  const existingCoerced = semver.coerce(removeRangePrefix(existing));
+  return existingCoerced && semver.gt(existingCoerced, removeRangePrefix(replacement)) ? existing : replacement;
 }
 function useLargerVersions(existing, replacements) {
   if (!existing) {

package/lib/blocks/blockRepositorySettings.js

@@ -1,11 +1,11 @@
-import * as htmlToText from "html-to-text";
 import { base } from "../base.js";
+import { htmlToTextSafe } from "./html/htmlToTextSafe.js";
 const blockRepositorySettings = base.createBlock({
   about: {
     name: "Repository Settings"
   },
   produce({ options }) {
-    const description = htmlToText.convert(options.description);
+    const description = htmlToTextSafe(options.description);
     return {
       requests: [
         {

package/lib/blocks/blockTSup.d.ts

@@ -2,7 +2,7 @@ import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockTSup: bingo_stratum.BlockWithAddons<{
     entry: string[];
-    runArgs: string[];
+    runInCI: string[];
 }, {
     access: "public" | "restricted";
     description: string;

package/lib/blocks/blockTSup.js

@@ -15,7 +15,7 @@ const blockTSup = base.createBlock({
   },
   addons: {
     entry: z.array(z.string()).default([]),
-    runArgs: z.array(z.string()).default([])
+    runInCI: z.array(z.string()).default([])
   },
   produce({ addons, options }) {
     const { entry } = addons;
@@ -49,9 +49,7 @@ pnpm build --watch
               name: "Build",
               steps: [
                 { run: "pnpm build" },
-                {
-                  run: `node lib/index.js${addons.runArgs.map((arg) => ` ${arg}`).join("")}`
-                }
+                ...addons.runInCI.map((run) => ({ run }))
               ]
             }
           ]

package/lib/blocks/blockTypeScript.js

@@ -79,7 +79,6 @@ export * from "./types.js";
           properties: {
             devDependencies: getPackageDependencies("typescript"),
             files: ["lib/"],
-            main: "lib/index.js",
             scripts: {
               tsc: "tsc"
             }

package/lib/blocks/html/htmlToTextSafe.d.ts

@@ -0,0 +1,3 @@
+declare function htmlToTextSafe(raw: string): string;
+
+export { htmlToTextSafe };

package/lib/blocks/html/htmlToTextSafe.js

@@ -0,0 +1,7 @@
+import { convert } from "html-to-text";
+function htmlToTextSafe(raw) {
+  return convert(raw, { wordwrap: false });
+}
+export {
+  htmlToTextSafe
+};

package/lib/blocks/index.d.ts

@@ -24,6 +24,7 @@ export { blockGitHubIssueTemplates } from './blockGitHubIssueTemplates.js';
 export { blockGitHubPRTemplate } from './blockGitHubPRTemplate.js';
 export { blockGitignore } from './blockGitignore.js';
 export { blockKnip } from './blockKnip.js';
+export { blockMain } from './blockMain.js';
 export { blockMarkdownlint } from './blockMarkdownlint.js';
 export { blockMITLicense } from './blockMITLicense.js';
 export { blockNcc } from './blockNcc.js';
@@ -1527,6 +1528,68 @@ declare const blocks: {
             hash?: string | undefined;
         }>> | undefined;
     }>;
+    blockMain: bingo_stratum.BlockWithAddons<{
+        runArgs: string[];
+        filePath?: string | undefined;
+    }, {
+        access: "public" | "restricted";
+        description: string;
+        directory: string;
+        email: {
+            github: string;
+            npm: string;
+        };
+        title: string;
+        owner: string;
+        repository: string;
+        author?: string | undefined;
+        bin?: string | Record<string, string> | undefined;
+        contributors?: {
+            avatar_url: string;
+            contributions: string[];
+            login: string;
+            name: string;
+            profile: string;
+        }[] | undefined;
+        documentation?: string | undefined;
+        emoji?: string | undefined;
+        existingLabels?: {
+            name: string;
+            description: string;
+            color: string;
+        }[] | undefined;
+        explainer?: string[] | undefined;
+        funding?: string | undefined;
+        guide?: {
+            href: string;
+            title: string;
+        } | undefined;
+        keywords?: string[] | undefined;
+        logo?: {
+            alt: string;
+            src: string;
+            height?: number | undefined;
+            width?: number | undefined;
+        } | undefined;
+        node?: {
+            minimum: string;
+            pinned?: string | undefined;
+        } | undefined;
+        packageData?: {
+            dependencies?: Record<string, string> | undefined;
+            devDependencies?: Record<string, string> | undefined;
+            scripts?: Record<string, string> | undefined;
+        } | undefined;
+        pnpm?: string | undefined;
+        rulesetId?: string | undefined;
+        usage?: string | undefined;
+        version?: string | undefined;
+        words?: string[] | undefined;
+        workflowsVersions?: Record<string, Record<string, {
+            pinned?: boolean | undefined;
+            hash?: string | undefined;
+        }>> | undefined;
+    }>;
     blockMarkdownlint: bingo_stratum.BlockWithAddons<{
         ignores: string[];
     }, {
@@ -2573,7 +2636,7 @@ declare const blocks: {
     }>;
     blockTSup: bingo_stratum.BlockWithAddons<{
         entry: string[];
-        runArgs: string[];
+        runInCI: string[];
     }, {
         access: "public" | "restricted";
         description: string;

package/lib/blocks/index.js

@@ -22,6 +22,7 @@ import { blockGitHubIssueTemplates } from "./blockGitHubIssueTemplates.js";
 import { blockGitHubPRTemplate } from "./blockGitHubPRTemplate.js";
 import { blockGitignore } from "./blockGitignore.js";
 import { blockKnip } from "./blockKnip.js";
+import { blockMain } from "./blockMain.js";
 import { blockMarkdownlint } from "./blockMarkdownlint.js";
 import { blockMITLicense } from "./blockMITLicense.js";
 import { blockNcc } from "./blockNcc.js";
@@ -67,6 +68,7 @@ const blocks = {
   blockGitHubPRTemplate,
   blockGitignore,
   blockKnip,
+  blockMain,
   blockMarkdownlint,
   blockMITLicense,
   blockNcc,
@@ -113,6 +115,7 @@ import { blockGitHubIssueTemplates as blockGitHubIssueTemplates2 } from "./block
 import { blockGitHubPRTemplate as blockGitHubPRTemplate2 } from "./blockGitHubPRTemplate.js";
 import { blockGitignore as blockGitignore2 } from "./blockGitignore.js";
 import { blockKnip as blockKnip2 } from "./blockKnip.js";
+import { blockMain as blockMain2 } from "./blockMain.js";
 import { blockMarkdownlint as blockMarkdownlint2 } from "./blockMarkdownlint.js";
 import { blockMITLicense as blockMITLicense2 } from "./blockMITLicense.js";
 import { blockNcc as blockNcc2 } from "./blockNcc.js";
@@ -160,6 +163,7 @@ export {
   blockGitignore2 as blockGitignore,
   blockKnip2 as blockKnip,
   blockMITLicense2 as blockMITLicense,
+  blockMain2 as blockMain,
   blockMarkdownlint2 as blockMarkdownlint,
   blockNcc2 as blockNcc,
   blockNvmrc2 as blockNvmrc,

package/lib/data/packageData.d.ts

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

package/lib/index.d.ts

@@ -31,6 +31,7 @@ export { blockGitHubIssueTemplates } from './blocks/blockGitHubIssueTemplates.js
 export { blockGitHubPRTemplate } from './blocks/blockGitHubPRTemplate.js';
 export { blockGitignore } from './blocks/blockGitignore.js';
 export { blockKnip } from './blocks/blockKnip.js';
+export { blockMain } from './blocks/blockMain.js';
 export { blockMarkdownlint } from './blocks/blockMarkdownlint.js';
 export { blockMITLicense } from './blocks/blockMITLicense.js';
 export { blockNcc } from './blocks/blockNcc.js';

package/lib/presets/minimal.js

@@ -9,6 +9,7 @@ import { blockGitHubApps } from "../blocks/blockGitHubApps.js";
 import { blockGitHubIssueTemplates } from "../blocks/blockGitHubIssueTemplates.js";
 import { blockGitHubPRTemplate } from "../blocks/blockGitHubPRTemplate.js";
 import { blockGitignore } from "../blocks/blockGitignore.js";
+import { blockMain } from "../blocks/blockMain.js";
 import { blockMITLicense } from "../blocks/blockMITLicense.js";
 import { blockPackageJson } from "../blocks/blockPackageJson.js";
 import { blockPrettier } from "../blocks/blockPrettier.js";
@@ -40,6 +41,7 @@ const presetMinimal = base.createPreset({
     blockGitHubIssueTemplates,
     blockGitHubPRTemplate,
     blockGitignore,
+    blockMain,
     blockMITLicense,
     blockPackageJson,
     blockPrettier,

package/lib/schemas.d.ts

@@ -7,16 +7,16 @@ declare const zContributor: z.ZodObject<{
     name: z.ZodString;
     profile: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     avatar_url: string;
     contributions: string[];
     login: string;
+    name: string;
     profile: string;
 }, {
-    name: string;
     avatar_url: string;
     contributions: string[];
     login: string;
+    name: string;
     profile: string;
 }>;
 type Contributor = z.infer<typeof zContributor>;

package/package.json

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