create-typescript-app 2.6.1 → 2.7.1

package/lib/base.js

@@ -3,6 +3,7 @@ import { inputFromFile } from "input-from-file";
 import { inputFromScript } from "input-from-script";
 import lazyValue from "lazy-value";
 import { z } from "zod";
+import { readAccess } from "./options/readAccess.js";
 import { readAllContributors } from "./options/readAllContributors.js";
 import { readAuthor } from "./options/readAuthor.js";
 import { readDescription } from "./options/readDescription.js";
@@ -100,6 +101,9 @@ const base = createBase({
     version: z.string().optional().describe("package version to publish as and store in `package.json`")
   },
   prepare({ options, take }) {
+    const getAccess = lazyValue(
+      async () => await readAccess(getPackageDataFull)
+    );
     const getAllContributors = lazyValue(
       async () => await readAllContributors(take)
     );
@@ -133,7 +137,7 @@ const base = createBase({
     );
     const getExplainer = lazyValue(async () => await readExplainer(getReadme));
     const getFunding = lazyValue(async () => await readFunding(take));
-    const getGitDefaults = lazyValue(async () => await readGitDefaults());
+    const getGitDefaults = lazyValue(async () => await readGitDefaults(take));
     const getGuide = lazyValue(async () => await readGuide(take));
     const getLogo = lazyValue(async () => await readLogo(getReadme));
     const getPackageData = lazyValue(
@@ -182,7 +186,7 @@ const base = createBase({
       async () => (await getPackageDataFull()).version
     );
     return {
-      access: "public",
+      access: getAccess,
       author: getAuthor,
       bin: getBin,
       contributors: getAllContributors,

package/lib/blocks/blockESLint.d.ts

@@ -1,6 +1,11 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockESLint: bingo_stratum.BlockWithAddons<{
+    imports: {
+        source: string;
+        specifier: string;
+        types?: boolean | undefined;
+    }[];
     extensions: (string | {
         files?: string[] | undefined;
         rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
@@ -15,11 +20,6 @@ declare const blockESLint: bingo_stratum.BlockWithAddons<{
     })[];
     ignores: string[];
     explanations: string[];
-    imports: {
-        source: string;
-        specifier: string;
-        types?: boolean | undefined;
-    }[];
     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]>;
         comment?: string | undefined;

package/lib/blocks/blockESLint.js

@@ -1,8 +1,8 @@
 import { parse as parsePackageName } from "parse-package-name";
+import sortKeys from "sort-keys";
 import { z } from "zod";
 import { base } from "../base.js";
 import { getPackageDependencies } from "../data/packageData.js";
-import { sortObject } from "../utils/sortObject.js";
 import { blockCSpell } from "./blockCSpell.js";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
@@ -218,7 +218,7 @@ function printExtension(extension) {
     extension.languageOptions && `languageOptions: ${JSON.stringify(extension.languageOptions).replace('"import.meta.dirname"', "import.meta.dirname")},`,
     extension.linterOptions && `linterOptions: ${JSON.stringify(extension.linterOptions)}`,
     extension.rules && `rules: ${printExtensionRules(extension.rules)},`,
-    extension.settings && `settings: ${JSON.stringify(sortObject(extension.settings))},`,
+    extension.settings && `settings: ${JSON.stringify(sortKeys(extension.settings))},`,
     "}"
   ].filter(Boolean).join(" ");
 }

package/lib/blocks/blockExampleFiles.js

@@ -14,8 +14,8 @@ const blockExampleFiles = base.createBlock({
       }
     };
   },
-  // TODO: Make produce() optional
-  // This needs createBlock to be generic to know if block.produce({}) is ok
+  // TODO: Make produce() optional, so this empty-ish produce() can be removed
+  // https://github.com/JoshuaKGoldberg/bingo/issues/295
   produce() {
     return {};
   }

package/lib/blocks/blockPackageJson.d.ts

@@ -2,12 +2,80 @@ import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
     properties: {
+        type?: "module" | "commonjs" | undefined;
+        author?: string | {
+            name: string;
+            url?: string | undefined;
+            email?: string | undefined;
+        } | undefined;
+        bin?: string | Record<string, string> | undefined;
+        name?: string | undefined;
+        contributors?: (string | {
+            name: string;
+            url?: string | undefined;
+            email?: string | undefined;
+        })[] | undefined;
+        description?: string | undefined;
+        funding?: string | {
+            url: string;
+            type?: string | undefined;
+        } | (string | {
+            url: string;
+            type?: string | undefined;
+        })[] | undefined;
+        keywords?: string[] | undefined;
         dependencies?: Record<string, string> | undefined;
         devDependencies?: Record<string, string> | undefined;
         scripts?: Record<string, string> | undefined;
+        repository?: string | {
+            type: string;
+            url: string;
+            directory?: string | undefined;
+        } | undefined;
+        version?: string | undefined;
+        module?: string | undefined;
+        engines?: Record<string, string> | undefined;
+        packageManager?: string | undefined;
         files?: string[] | undefined;
+        license?: string | undefined;
+        config?: Record<string, unknown> | undefined;
+        private?: boolean | undefined;
+        homepage?: string | undefined;
+        maintainers?: (string | {
+            name: string;
+            url?: string | undefined;
+            email?: string | undefined;
+        })[] | undefined;
+        publishConfig?: Record<string, unknown> | undefined;
+        main?: string | undefined;
+        types?: string | undefined;
+        bugs?: string | {
+            url?: string | undefined;
+            email?: string | undefined;
+        } | undefined;
+        browser?: string | Record<string, string | boolean> | undefined;
+        man?: string | string[] | undefined;
+        directories?: Record<string, string> | undefined;
         peerDependencies?: Record<string, string> | undefined;
-    } & Record<string, unknown>;
+        peerDependenciesMeta?: Record<string, {
+            optional: boolean;
+        }> | undefined;
+        bundleDependencies?: boolean | string[] | undefined;
+        bundledDependencies?: boolean | string[] | undefined;
+        optionalDependencies?: Record<string, string> | undefined;
+        overrides?: Record<string, unknown> | undefined;
+        os?: string[] | undefined;
+        cpu?: string[] | undefined;
+        workspaces?: string[] | undefined;
+        deprecated?: string | undefined;
+        typings?: string | undefined;
+        typesVersions?: Record<string, Record<string, string[]>> | undefined;
+        sideEffects?: boolean | string[] | undefined;
+        imports?: Record<string, unknown> | undefined;
+        exports?: string | string[] | Record<string, unknown> | null | undefined;
+    } & {
+        [k: string]: unknown;
+    };
     cleanupCommands: string[];
 }, {
     access: "public" | "restricted";

package/lib/blocks/blockPackageJson.js

@@ -2,6 +2,7 @@ import * as htmlToText from "html-to-text";
 import removeUndefinedObjects from "remove-undefined-objects";
 import sortPackageJson from "sort-package-json";
 import { z } from "zod";
+import { PackageJson } from "zod-package-json";
 import { base } from "../base.js";
 import { CommandPhase } from "./phases.js";
 const blockPackageJson = base.createBlock({
@@ -10,17 +11,7 @@ const blockPackageJson = base.createBlock({
   },
   addons: {
     cleanupCommands: z.array(z.string()).default([]),
-    // TODO: Find a zod package for this?
-    properties: z.intersection(
-      z.object({
-        dependencies: z.record(z.string(), z.string()).optional(),
-        devDependencies: z.record(z.string(), z.string()).optional(),
-        files: z.array(z.string()).optional(),
-        peerDependencies: z.record(z.string(), z.string()).optional(),
-        scripts: z.record(z.string(), z.string()).optional()
-      }),
-      z.record(z.string(), z.unknown())
-    ).default({})
+    properties: PackageJson.partial().default({})
   },
   produce({ addons, offline, options }) {
     const dependencies = {

package/lib/blocks/blockPrettier.d.ts

@@ -1,14 +1,14 @@
 import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockPrettier: bingo_stratum.BlockWithAddons<{
-    ignores: string[];
-    plugins: string[];
     overrides: {
         options: {
             parser: string;
         };
         files: string;
     }[];
+    ignores: string[];
+    plugins: string[];
 }, {
     access: "public" | "restricted";
     description: string;

package/lib/blocks/blockRepositoryBranchRuleset.js

@@ -43,8 +43,8 @@ const blockRepositoryBranchRuleset = base.createBlock({
       ]
     };
   },
-  // TODO: Make produce() optional
-  // This needs createBlock to be generic to know if block.produce({}) is ok
+  // TODO: Make produce() optional, so this empty-ish produce() can be removed
+  // https://github.com/JoshuaKGoldberg/bingo/issues/295
   produce() {
     return {};
   }

package/lib/blocks/blockVSCode.js

@@ -1,6 +1,6 @@
+import sortKeys from "sort-keys";
 import { z } from "zod";
 import { base } from "../base.js";
-import { sortObject } from "../utils/sortObject.js";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 const blockVSCode = base.createBlock({
   about: {
@@ -70,7 +70,7 @@ To launch it, open a test file, then run _Debug Current Test File_ from the VS C
             version: "0.2.0"
           }),
           "settings.json": JSON.stringify(
-            sortObject({
+            sortKeys({
               "editor.formatOnSave": true,
               "editor.rulers": [80],
               ...settings

package/lib/blocks/index.d.ts

@@ -443,6 +443,11 @@ declare const blocks: {
         version?: string | undefined;
     }>;
     blockESLint: bingo_stratum.BlockWithAddons<{
+        imports: {
+            source: string;
+            specifier: string;
+            types?: boolean | undefined;
+        }[];
         extensions: (string | {
             files?: string[] | undefined;
             rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
@@ -457,11 +462,6 @@ declare const blocks: {
         })[];
         ignores: string[];
         explanations: string[];
-        imports: {
-            source: string;
-            specifier: string;
-            types?: boolean | undefined;
-        }[];
         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]>;
             comment?: string | undefined;
@@ -1569,12 +1569,80 @@ declare const blocks: {
     }>;
     blockPackageJson: bingo_stratum.BlockWithAddons<{
         properties: {
+            type?: "module" | "commonjs" | undefined;
+            author?: string | {
+                name: string;
+                url?: string | undefined;
+                email?: string | undefined;
+            } | undefined;
+            bin?: string | Record<string, string> | undefined;
+            name?: string | undefined;
+            contributors?: (string | {
+                name: string;
+                url?: string | undefined;
+                email?: string | undefined;
+            })[] | undefined;
+            description?: string | undefined;
+            funding?: string | {
+                url: string;
+                type?: string | undefined;
+            } | (string | {
+                url: string;
+                type?: string | undefined;
+            })[] | undefined;
+            keywords?: string[] | undefined;
             dependencies?: Record<string, string> | undefined;
             devDependencies?: Record<string, string> | undefined;
             scripts?: Record<string, string> | undefined;
+            repository?: string | {
+                type: string;
+                url: string;
+                directory?: string | undefined;
+            } | undefined;
+            version?: string | undefined;
+            module?: string | undefined;
+            engines?: Record<string, string> | undefined;
+            packageManager?: string | undefined;
             files?: string[] | undefined;
+            license?: string | undefined;
+            config?: Record<string, unknown> | undefined;
+            private?: boolean | undefined;
+            homepage?: string | undefined;
+            maintainers?: (string | {
+                name: string;
+                url?: string | undefined;
+                email?: string | undefined;
+            })[] | undefined;
+            publishConfig?: Record<string, unknown> | undefined;
+            main?: string | undefined;
+            types?: string | undefined;
+            bugs?: string | {
+                url?: string | undefined;
+                email?: string | undefined;
+            } | undefined;
+            browser?: string | Record<string, string | boolean> | undefined;
+            man?: string | string[] | undefined;
+            directories?: Record<string, string> | undefined;
             peerDependencies?: Record<string, string> | undefined;
-        } & Record<string, unknown>;
+            peerDependenciesMeta?: Record<string, {
+                optional: boolean;
+            }> | undefined;
+            bundleDependencies?: boolean | string[] | undefined;
+            bundledDependencies?: boolean | string[] | undefined;
+            optionalDependencies?: Record<string, string> | undefined;
+            overrides?: Record<string, unknown> | undefined;
+            os?: string[] | undefined;
+            cpu?: string[] | undefined;
+            workspaces?: string[] | undefined;
+            deprecated?: string | undefined;
+            typings?: string | undefined;
+            typesVersions?: Record<string, Record<string, string[]>> | undefined;
+            sideEffects?: boolean | string[] | undefined;
+            imports?: Record<string, unknown> | undefined;
+            exports?: string | string[] | Record<string, unknown> | null | undefined;
+        } & {
+            [k: string]: unknown;
+        };
         cleanupCommands: string[];
     }, {
         access: "public" | "restricted";
@@ -1739,14 +1807,14 @@ declare const blocks: {
         version?: string | undefined;
     }>;
     blockPrettier: bingo_stratum.BlockWithAddons<{
-        ignores: string[];
-        plugins: string[];
         overrides: {
             options: {
                 parser: string;
             };
             files: string;
         }[];
+        ignores: string[];
+        plugins: string[];
     }, {
         access: "public" | "restricted";
         description: string;

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.6.0";
+var version = "2.7.0";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",
@@ -38,7 +38,6 @@ var dependencies = {
 	"bingo-stratum": "^0.5.5",
 	"cspell-populate-words": "^0.3.0",
 	execa: "^9.5.2",
-	"git-remote-origin-url": "^4.0.0",
 	"git-url-parse": "^16.0.1",
 	"github-default-labels": "^0.1.0",
 	"html-to-text": "^9.0.5",
@@ -56,9 +55,11 @@ var dependencies = {
 	"remove-dependencies": "^0.1.0",
 	"remove-undefined-objects": "^6.0.0",
 	"set-github-repository-labels": "^0.2.0",
+	"sort-keys": "^5.1.0",
 	"sort-package-json": "^3.0.0",
 	"title-case": "^4.3.2",
-	zod: "^3.24.2"
+	zod: "^3.24.2",
+	"zod-package-json": "^1.1.0"
 };
 var devDependencies = {
 	"@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
@@ -73,7 +74,7 @@ var devDependencies = {
 	"@types/node": "22.13.9",
 	"@types/parse-author": "2.0.3",
 	"@vitest/coverage-v8": "3.0.7",
-	"@vitest/eslint-plugin": "1.1.36",
+	"@vitest/eslint-plugin": "1.1.38",
 	"all-contributors-cli": "6.26.1",
 	"bingo-requests": "^0.5.4",
 	"bingo-stratum-testers": "0.5.6",

package/lib/inputs/inputFromOctokit.js

@@ -6,8 +6,7 @@ const inputFromOctokit = createInput({
     options: z.record(z.string(), z.unknown()).optional()
   },
   // TODO: Strongly type this, then push it upstream to Bingo
-  // This will require smart types around GitHub endpoints, similar to:
-  // https://github.com/JoshuaKGoldberg/bingo/issues/65
+  // https://github.com/JoshuaKGoldberg/bingo/issues/296
   async produce({ args, fetchers }) {
     try {
       const response = await fetchers.octokit.request(args.endpoint, {

package/lib/options/readAccess.d.ts

@@ -0,0 +1,5 @@
+import { PartialPackageData } from '../types.js';
+
+declare function readAccess(getPackageDataFull: () => Promise<PartialPackageData | undefined>): Promise<"public" | "restricted">;
+
+export { readAccess };

package/lib/options/readAccess.js

@@ -0,0 +1,6 @@
+async function readAccess(getPackageDataFull) {
+  return (await getPackageDataFull())?.publishConfig?.access ?? "public";
+}
+export {
+  readAccess
+};

package/lib/options/readGitDefaults.d.ts

@@ -1,5 +1,6 @@
+import { TakeInput } from 'bingo';
 import gitUrlParse from 'git-url-parse';
 
-declare function readGitDefaults(): Promise<gitUrlParse.GitUrl | undefined>;
+declare function readGitDefaults(take: TakeInput): Promise<gitUrlParse.GitUrl | undefined>;
 
 export { readGitDefaults };

package/lib/options/readGitDefaults.js

@@ -1,11 +1,10 @@
-import gitRemoteOriginUrl from "git-remote-origin-url";
 import gitUrlParse from "git-url-parse";
-async function readGitDefaults() {
-  try {
-    return gitUrlParse(await gitRemoteOriginUrl());
-  } catch {
-    return void 0;
-  }
+import { inputFromScript } from "input-from-script";
+async function readGitDefaults(take) {
+  const url = await take(inputFromScript, {
+    command: "git remote get-url origin"
+  });
+  return url.stdout ? gitUrlParse(url.stdout.toString()) : void 0;
 }
 export {
   readGitDefaults

package/lib/types.d.ts

@@ -23,6 +23,7 @@ interface PartialPackageData {
     };
     name?: string;
     packageManager?: string;
+    publishConfig?: PartialPublishConfig;
     repository?: string | {
         type: string;
         url: string;
@@ -30,5 +31,8 @@ interface PartialPackageData {
     scripts?: Record<string, string>;
     version?: string;
 }
+interface PartialPublishConfig {
+    access?: "public" | "restricted";
+}
 
 export type { AllContributorContributor, AllContributorsData, PartialPackageData };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.6.1",
+	"version": "2.7.1",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",
@@ -42,7 +42,6 @@
 		"bingo-stratum": "^0.5.5",
 		"cspell-populate-words": "^0.3.0",
 		"execa": "^9.5.2",
-		"git-remote-origin-url": "^4.0.0",
 		"git-url-parse": "^16.0.1",
 		"github-default-labels": "^0.1.0",
 		"html-to-text": "^9.0.5",
@@ -60,9 +59,11 @@
 		"remove-dependencies": "^0.1.0",
 		"remove-undefined-objects": "^6.0.0",
 		"set-github-repository-labels": "^0.2.0",
+		"sort-keys": "^5.1.0",
 		"sort-package-json": "^3.0.0",
 		"title-case": "^4.3.2",
-		"zod": "^3.24.2"
+		"zod": "^3.24.2",
+		"zod-package-json": "^1.1.0"
 	},
 	"devDependencies": {
 		"@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
@@ -77,7 +78,7 @@
 		"@types/node": "22.13.9",
 		"@types/parse-author": "2.0.3",
 		"@vitest/coverage-v8": "3.0.7",
-		"@vitest/eslint-plugin": "1.1.36",
+		"@vitest/eslint-plugin": "1.1.38",
 		"all-contributors-cli": "6.26.1",
 		"bingo-requests": "^0.5.4",
 		"bingo-stratum-testers": "0.5.6",

package/lib/utils/sortObject.d.ts

@@ -1,5 +0,0 @@
-declare function sortObject(value: object | Record<string, unknown>): {
-    [k: string]: any;
-};
-
-export { sortObject };

package/lib/utils/sortObject.js

@@ -1,8 +0,0 @@
-function sortObject(value) {
-  return Object.fromEntries(
-    Object.entries(value).sort(([a], [b]) => a.localeCompare(b))
-  );
-}
-export {
-  sortObject
-};