@dword-design/base 13.1.3 → 14.0.1

package/dist/cli.js

@@ -19,7 +19,7 @@ const testOptions = [{
 }];
 try {
   await makeCli({
-    commands: Object.values(mapValues({
+    commands: {
       checkUnknownFiles: {
         handler: () => base.checkUnknownFiles()
       },
@@ -61,10 +61,7 @@ try {
         ...command,
         handler: (...args) => base.run(name, ...args)
       }))
-    }, (command, name) => ({
-      name,
-      ...command
-    })))
+    }
   });
 } catch (error) {
   console.error(error);

package/dist/commands/command-options-input.d.ts

@@ -0,0 +1,6 @@
+import type { StdoutStderrOptionCommon } from 'execa';
+
+export type CommandOptionsInput = {
+  log?: boolean;
+  stderr?: StdoutStderrOptionCommon<false>;
+};

package/dist/commands/lint/index.d.ts

@@ -1 +1,2 @@
-export default function (options: any): Promise<import("execa").Result<any>>;
+import type { CommandOptionsInput } from '@/src/commands/command-options-input';
+export default function (optionsInput?: CommandOptionsInput): Promise<import("execa").Result<any>>;

package/dist/commands/lint/index.js

@@ -1,13 +1,10 @@
-import pathLib from "node:path";
 import { execaCommand } from "execa";
-import { globby } from "globby";
 import parsePackagejsonName from "parse-packagejson-name";
-import ts from "typescript";
-export default async function (options) {
-  options = {
+export default async function (optionsInput) {
+  const options = {
     log: process.env.NODE_ENV !== "test",
     stderr: "inherit",
-    ...options
+    ...optionsInput
   };
   const packageName = parsePackagejsonName(this.packageConfig.name).fullName;
   if (this.config.git !== void 0 && packageName !== this.config.git.project) {
@@ -21,26 +18,6 @@ export default async function (options) {
     cwd: this.cwd,
     stderr: options.stderr
   });
-  const {
-    config
-  } = ts.readConfigFile(pathLib.join(this.cwd, "tsconfig.json"), ts.sys.readFile);
-  const {
-    fileNames
-  } = ts.parseJsonConfigFileContent(config, ts.sys, this.cwd);
-  const vueFiles = await globby("**/*.vue", {
-    cwd: this.cwd,
-    dot: true,
-    ignore: ["**/node_modules/**"]
-  });
-  const allFileNames = [...fileNames, ...vueFiles];
-  if (allFileNames.length > 0) {
-    await execaCommand("vue-tsc --noEmit", {
-      ...(options.log && {
-        stdout: "inherit"
-      }),
-      cwd: this.cwd,
-      stderr: options.stderr
-    });
-  }
+  await this.typecheck(options);
   return result;
 }

package/dist/commands/typecheck/index.d.ts

@@ -0,0 +1,2 @@
+import type { CommandOptionsInput } from '@/src/commands/command-options-input';
+export default function (optionsInput?: CommandOptionsInput): Promise<import("execa").Result<any> | undefined>;

package/dist/commands/typecheck/index.js

@@ -0,0 +1,32 @@
+import pathLib from "node:path";
+import { execaCommand } from "execa";
+import { globby } from "globby";
+import ts from "typescript";
+export default async function (optionsInput) {
+  const options = {
+    log: process.env.NODE_ENV !== "test",
+    stderr: "inherit",
+    ...optionsInput
+  };
+  const {
+    config
+  } = ts.readConfigFile(pathLib.join(this.cwd, "tsconfig.json"), ts.sys.readFile);
+  const {
+    fileNames
+  } = ts.parseJsonConfigFileContent(config, ts.sys, this.cwd);
+  const vueFiles = await globby("**/*.vue", {
+    cwd: this.cwd,
+    dot: true,
+    ignore: ["**/node_modules/**"]
+  });
+  const allFileNames = [...fileNames, ...vueFiles];
+  if (allFileNames.length > 0) {
+    return execaCommand("vue-tsc --noEmit", {
+      ...(options.log && {
+        stdout: "inherit"
+      }),
+      cwd: this.cwd,
+      stderr: options.stderr
+    });
+  }
+}

package/dist/get-generated-files/get-github-workflow/steps/get-test.js

@@ -26,7 +26,7 @@ export default function () {
     uses: gitHubAction`actions/upload-artifact@v4`,
     with: {
       "if-no-files-found": "ignore",
-      name: "Images from tests",
+      name: "Data from tests",
       path: "test-results/*/**"
     }
   }];

package/dist/get-generated-files/get-gitpod/index.js

@@ -13,7 +13,13 @@ export default function () {
       // https://www.gitpod.io/docs/configure/workspaces/workspace-lifecycle#workspace-stopped
       before: endent`
           echo "corepack enable" >> /home/gitpod/.bashrc
+
+          # Prevent this prompt:
+          # pnpm install --frozen-lockfile
+          # ! Corepack is about to download https://registry.npmjs.org/pnpm/-/pnpm-10.7.1.tgz
+          # ? Do you want to continue? [Y/n]
           echo "export COREPACK_ENABLE_DOWNLOAD_PROMPT=0" >> /home/gitpod/.bashrc
+
           gitpod-env-per-project >> /home/gitpod/.bashrc
           echo "export PUPPETEER_CACHE_DIR=/workspace/${packageName}/node_modules/.cache/puppeteer" >> /home/gitpod/.bashrc
           echo "export PLAYWRIGHT_BROWSERS_PATH=0" >> /home/gitpod/.bashrc

package/dist/get-generated-files/get-renovate/index.js

@@ -1,7 +1,7 @@
-import deepmerge from "deepmerge";
+import defu from "@dword-design/defu";
 import getRegexManagerString from "./get-regex-manager-string/index.js";
 export default function () {
-  return deepmerge({
+  return defu(this.config.renovateConfig, {
     extends: [":semanticCommits", ":semanticPrefixFix"],
     gitIgnoredAuthors: ["actions@github.com"],
     "github-actions": {
@@ -29,5 +29,5 @@ export default function () {
       versioningTemplate: "node"
     }],
     semanticCommitScope: null
-  }, this.config.renovateConfig || {});
+  });
 }

package/dist/get-generated-files/{get-typescript.js → get-typescript/index.js}

@@ -14,6 +14,7 @@ export default function () {
       }),
       skipLibCheck: true,
       target: "ESNext"
-    }
+    },
+    exclude: ["test-results"]
   });
 }

package/dist/get-git-info/index.js

@@ -14,8 +14,8 @@ export default ({
   if (gitUrl === void 0) {
     return;
   }
-  const gitInfo = hostedGitInfo.fromUrl(gitUrl) || {};
-  if (gitInfo.type !== "github") {
+  const gitInfo = hostedGitInfo.fromUrl(gitUrl);
+  if (!gitInfo || gitInfo.type !== "github") {
     throw new Error("Only GitHub repositories are supported.");
   }
   return gitInfo;

package/dist/index.d.ts

@@ -1,7 +1,57 @@
+import type { Options as DepcheckOptions } from 'depcheck';
 import { type ResultPromise } from 'execa';
+import type GitHost from 'hosted-git-info';
+import type { CommandInObjectInput, CommandObjectInObjectInput } from 'make-cli';
+import type { RenovateConfig } from 'renovate/dist/config/types';
+import type { PackageJson, TsConfigJson } from 'type-fest';
+import type { CommandOptionsInput } from './commands/command-options-input';
+type Config = {
+    name?: string;
+    global: boolean;
+    allowedMatches: string[];
+    commands: Record<string, CommandObjectInObjectInput>;
+    depcheckConfig: Omit<DepcheckOptions, 'package'>;
+    deployAssets: Array<{
+        label: string;
+        path: string;
+    }>;
+    deployEnv: Record<string, string>;
+    deployPlugins: string[];
+    editorIgnore: string[];
+    fetchGitHistory: boolean;
+    git?: GitHost;
+    gitignore: string[];
+    hasTypescriptConfigRootAlias: boolean;
+    lint: (optionsInput?: CommandOptionsInput) => void;
+    macos: boolean;
+    minNodeVersion: number;
+    nodeVersion: number;
+    preDeploySteps: string[];
+    prepare: (optionsInput?: CommandOptionsInput) => void;
+    readmeInstallString: string;
+    seeAlso: Array<{
+        description: string;
+        repository: string;
+    }>;
+    supportedNodeVersions: number[];
+    syncKeywords: boolean;
+    typescriptConfig: TsConfigJson;
+    windows: boolean;
+    testInContainer: boolean;
+    eslintConfig: string;
+    useJobMatrix: boolean;
+    packageConfig: PackageJson;
+    renovateConfig: RenovateConfig;
+    isLockFileFixCommitType: boolean;
+};
+type ConfigObjectInput = Omit<Partial<Config>, 'commands'> & {
+    commands?: Record<string, CommandInObjectInput>;
+};
+type ConfigObjectOrFunctionInput = ConfigObjectInput | ((this: Base) => ConfigObjectInput);
+type ConfigInput = ConfigObjectOrFunctionInput | string | null;
 declare class Base {
-    config: any;
-    packageConfig: any;
+    config: Config;
+    packageConfig: PackageJson;
     cwd: string;
     generatedFiles: any;
     githubCodespacesConfig: {
@@ -9,6 +59,7 @@ declare class Base {
     };
     commit(...args: any[]): ResultPromise;
     lint(...args: any[]): ResultPromise;
+    typecheck(...args: any[]): ResultPromise;
     prepare(...args: any[]): void;
     test(...args: any[]): ResultPromise;
     testRaw(...args: any[]): ResultPromise;
@@ -30,7 +81,7 @@ declare class Base {
     getRenovateConfig(...args: any[]): any;
     getVscodeConfig(...args: any[]): any;
     getTypescriptConfig(...args: any[]): any;
-    constructor(config?: null, { cwd }?: {
+    constructor(configInput?: ConfigInput, { cwd }?: {
         cwd?: string | undefined;
     });
     run(name: any, ...args: any[]): any;
@@ -38,3 +89,4 @@ declare class Base {
 export { default as loadConfig } from './load-config';
 export { default as loadConfigSync } from './load-config-sync';
 export { Base };
+export type { Config, ConfigInput };

package/dist/index.js

@@ -1,5 +1,5 @@
 import pathLib from "node:path";
-import deepmerge from "deepmerge";
+import { createDefu } from "@dword-design/defu";
 import depcheck from "depcheck";
 import depcheckDetectorBinName from "depcheck-detector-bin-name";
 import depcheckDetectorExeca from "depcheck-detector-execa";
@@ -18,6 +18,7 @@ import prepare from "./commands/prepare/index.js";
 import test from "./commands/test/index.js";
 import testDocker from "./commands/test-docker/index.js";
 import testRaw from "./commands/test-raw/index.js";
+import typecheck from "./commands/typecheck/index.js";
 import getDepcheckSpecialBase from "./get-depcheck-special-base/index.js";
 import getGeneratedFiles from "./get-generated-files/index.js";
 import getEditorIgnoreConfig from "./get-generated-files/get-editor-ignore/index.js";
@@ -32,16 +33,17 @@ import getPackageConfig from "./get-generated-files/get-package-config/index.js"
 import getReadmeString from "./get-generated-files/get-readme-string/index.js";
 import getReleaseConfig from "./get-generated-files/get-release/index.js";
 import getRenovateConfig from "./get-generated-files/get-renovate/index.js";
-import getTypescriptConfig from "./get-generated-files/get-typescript.js";
+import getTypescriptConfig from "./get-generated-files/get-typescript/index.js";
 import getVscodeConfig from "./get-generated-files/get-vscode/index.js";
 import githubCodespacesConfig from "./get-generated-files/github-codespaces.js";
 import getGitInfo from "./get-git-info/index.js";
-const mergeConfigs = (...configs) => {
-  const result = deepmerge.all(configs, {
-    customMerge: key => key === "supportedNodeVersions" ? (a, b) => b : void 0
-  });
-  return result;
-};
+const mergeConfigs = createDefu((obj, key, value) => {
+  if (key === "supportedNodeVersions") {
+    obj[key] = value;
+    return true;
+  }
+  return false;
+});
 class Base {
   config;
   packageConfig;
@@ -54,6 +56,9 @@ class Base {
   lint(...args) {
     return lint.call(this, ...args);
   }
+  typecheck(...args) {
+    return typecheck.call(this, ...args);
+  }
   prepare(...args) {
     return prepare.call(this, ...args);
   }
@@ -117,19 +122,25 @@ class Base {
   getTypescriptConfig(...args) {
     return getTypescriptConfig.call(this, ...args);
   }
-  constructor(config = null, {
+  constructor(configInput = null, {
     cwd = "."
   } = {}) {
     this.cwd = cwd;
     const jitiInstance = createJiti(pathLib.resolve(this.cwd));
-    if (config === null) {
-      config = {
-        name: packageName`@dword-design/base-config-node`
-      };
-    }
-    if (typeof config === "function") {
-      config = config.call(this);
-    }
+    const config = (() => {
+      if (configInput === null) {
+        return {
+          name: packageName`@dword-design/base-config-node`
+        };
+      } else if (typeof configInput === "string") {
+        return {
+          name: configInput
+        };
+      } else if (typeof configInput === "function") {
+        return configInput.call(this);
+      }
+      return configInput;
+    })();
     if (config.name) {
       config.name = pluginNameToPackageName(config.name, "base-config");
     }
@@ -149,16 +160,20 @@ class Base {
       deployEnv: {},
       deployPlugins: [],
       editorIgnore: [],
+      eslintConfig: "",
       fetchGitHistory: false,
       git: getGitInfo({
         cwd: this.cwd
       }),
       gitignore: [],
+      global: false,
       hasTypescriptConfigRootAlias: true,
-      lint: identity,
+      isLockFileFixCommitType: false,
+      lint: () => {},
       macos: true,
       minNodeVersion: null,
       nodeVersion: 20,
+      packageConfig: {},
       preDeploySteps: [],
       prepare: identity,
       readmeInstallString: endent`
@@ -172,26 +187,24 @@ class Base {
         $ yarn ${config.global ? "global " : ""}add ${this.packageConfig.name}
         \`\`\`
       `,
+      renovateConfig: {},
       seeAlso: [],
-      supportedNodeVersions: [18, 20],
+      supportedNodeVersions: [20, 22],
       syncKeywords: true,
+      testInContainer: false,
       typescriptConfig: {},
+      useJobMatrix: true,
       windows: true
     };
-    const configsToMerge = [defaultConfig];
-    if (config.name) {
-      const inheritedConfigPath = config.name === this.packageConfig.name ? pathLib.resolve(this.cwd, "src", "index.ts") : config.name;
-      let inheritedConfig = inheritedConfigPath ? jitiInstance(inheritedConfigPath) : void 0;
-      if (inheritedConfig?.default) {
-        inheritedConfig = inheritedConfig.default;
-      }
-      if (typeof inheritedConfig === "function") {
-        inheritedConfig = inheritedConfig.call(this, mergeConfigs(defaultConfig, config));
-      }
-      configsToMerge.push(inheritedConfig);
+    const inheritedConfigPath = config.name && config.name === this.packageConfig.name ? pathLib.resolve(this.cwd, "src", "index.ts") : config.name;
+    let inheritedConfig = inheritedConfigPath ? jitiInstance(inheritedConfigPath) : void 0;
+    if (inheritedConfig && "default" in inheritedConfig) {
+      inheritedConfig = inheritedConfig.default;
+    }
+    if (typeof inheritedConfig === "function") {
+      inheritedConfig = inheritedConfig.call(this, mergeConfigs(defaultConfig, config));
     }
-    configsToMerge.push(config);
-    this.config = mergeConfigs(...configsToMerge);
+    this.config = mergeConfigs(config, inheritedConfig, defaultConfig);
     this.config = {
       ...this.config,
       commands: mapValues(this.config.commands, command => typeof command === "function" ? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base",
-  "version": "13.1.3",
+  "version": "14.0.1",
   "description": "Base package for projects.",
   "repository": "dword-design/base",
   "funding": "https://github.com/sponsors/dword-design",
@@ -33,9 +33,9 @@
   "dependencies": {
     "@commitlint/cli": "^18.6.1",
     "@commitlint/config-conventional": "^18.6.3",
-    "@dword-design/base-config-node": "^3.0.16",
+    "@dword-design/base-config-node": "^3.0.17",
     "@dword-design/ci": "^4.0.6",
-    "@dword-design/defu": "^1.0.0",
+    "@dword-design/defu": "^1.0.3",
     "@dword-design/eslint-config": "^7.0.7",
     "@dword-design/personal-data": "^2.0.3",
     "@semantic-release/changelog": "^6.0.3",
@@ -46,14 +46,13 @@
     "commitizen": "^4.3.1",
     "cosmiconfig": "^9.0.0",
     "cz-conventional-changelog": "^3.3.0",
-    "deepmerge": "^4.3.1",
     "depcheck": "npm:@dword-design/depcheck@^0.0.7",
     "depcheck-detector-bin-name": "^1.0.2",
     "depcheck-detector-execa": "^4.0.3",
     "depcheck-detector-package-name": "^3.0.4",
     "depcheck-package-name": "^3.0.1",
     "endent": "npm:@dword-design/endent@^1.4.1",
-    "eslint": "^9.29.0",
+    "eslint": "^9.31.0",
     "execa": "^9.6.0",
     "find-up": "^7.0.0",
     "fs-extra": "^11.3.0",
@@ -65,8 +64,8 @@
     "is-ci": "^3.0.1",
     "jiti": "^2.4.2",
     "lodash-es": "^4.17.21",
-    "make-cli": "^4.0.0",
-    "output-files": "^2.0.32",
+    "make-cli": "^4.0.6",
+    "output-files": "^3.0.0",
     "package-name-regex": "^4.0.3",
     "parse-git-config": "npm:@dword-design/parse-git-config@^0.0.1",
     "parse-packagejson-name": "^1.0.1",
@@ -79,22 +78,25 @@
     "spdx-license-list": "^6.10.0",
     "tagged-template-noop": "^2.1.1",
     "tsx": "^4.20.3",
+    "type-fest": "^4.41.0",
     "typescript": "^5.8.3",
-    "vue-tsc": "^2.2.10",
+    "vue-tsc": "^2.2.12",
     "yaml": "^2.8.0"
   },
   "devDependencies": {
     "@dword-design/dotenv-json-extended": "^3.0.3",
-    "@playwright/test": "^1.53.1",
+    "@playwright/test": "^1.54.1",
+    "@types/hosted-git-info": "^3.0.5",
+    "@types/parse-git-config": "^3.0.4",
     "p-event": "^6.0.1",
     "renovate": "^39.264.1",
-    "sharp": "^0.34.2",
+    "sharp": "^0.34.3",
     "strip-ansi": "^7.1.0",
     "uuid": "^11.1.0"
   },
   "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "publishConfig": {
     "access": "public"