@sektek/generator-js 0.2.1 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +19 -5
- package/dist/generators/app/index.d.ts +2 -0
- package/dist/generators/app/index.js +10 -2
- package/dist/generators/app/index.js.map +1 -1
- package/dist/generators/base-package/index.d.ts +2 -0
- package/dist/generators/base-package/index.js +5 -2
- package/dist/generators/base-package/index.js.map +1 -1
- package/dist/generators/dependencies/index.d.ts +10 -0
- package/dist/generators/dependencies/index.js +27 -0
- package/dist/generators/dependencies/index.js.map +1 -0
- package/dist/generators/mocha/index.js +1 -0
- package/dist/generators/mocha/index.js.map +1 -1
- package/dist/generators/typescript/index.js +7 -3
- package/dist/generators/typescript/index.js.map +1 -1
- package/dist/generators/typescript/templates/tsconfig.json.ejs +1 -1
- package/dist/generators/vitest/index.d.ts +13 -0
- package/dist/generators/vitest/index.js +31 -0
- package/dist/generators/vitest/index.js.map +1 -0
- package/dist/generators/{typescript/templates/index.spec.ts.ejs → vitest/templates/index.spec.ejs} +1 -1
- package/dist/generators/vitest/templates/vitest.config.ts.ejs +21 -0
- package/dist/lib/base-generator.d.ts +0 -1
- package/dist/lib/base-generator.js +13 -16
- package/dist/lib/base-generator.js.map +1 -1
- package/dist/lib/detect-dependency-conflicts.d.ts +9 -0
- package/dist/lib/detect-dependency-conflicts.js +12 -0
- package/dist/lib/detect-dependency-conflicts.js.map +1 -0
- package/dist/lib/parse-dependency-spec.d.ts +6 -0
- package/dist/lib/parse-dependency-spec.js +11 -0
- package/dist/lib/parse-dependency-spec.js.map +1 -0
- package/dist/lib/types/base-options.d.ts +3 -0
- package/dist/lib/version-resolver.d.ts +8 -0
- package/dist/lib/version-resolver.js +27 -0
- package/dist/lib/version-resolver.js.map +1 -0
- package/dist/manifest.d.ts +1 -1
- package/dist/manifest.js +2 -0
- package/dist/manifest.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -4
- /package/dist/generators/{base-package/templates/index.spec.js.ejs → mocha/templates/index.spec.ejs} +0 -0
package/README.md
CHANGED
|
@@ -9,15 +9,29 @@ JS/TS project generator for scaffolding new SEKTEK projects, driven by
|
|
|
9
9
|
`license: 'UNLICENSED'`, `private: true`. Sub-generators:
|
|
10
10
|
|
|
11
11
|
- `app` — the entrypoint; composes `@sektek/base:app`, `@sektek/base:devcontainer`,
|
|
12
|
-
`base-package`, `gitconfig`, `eslint`,
|
|
13
|
-
`
|
|
12
|
+
`base-package`, `gitconfig`, `eslint`, and, when `language: 'typescript'`, `typescript`. Also
|
|
13
|
+
composes a test framework based on `testFramework` (`'mocha'` (default), `'vitest'`, or
|
|
14
|
+
`'none'` to skip test tooling entirely): `mocha` unless `testFramework` is exactly `'vitest'`
|
|
15
|
+
or `'none'`. Composes `dependencies` last, after every other dependency-writing sub-generator,
|
|
16
|
+
so a caller-pinned version wins over whatever version those sub-generators resolve for an
|
|
17
|
+
overlapping package name.
|
|
14
18
|
- `base-package` — writes `package.json` and, for `language: 'javascript'`, a plain-JS
|
|
15
|
-
entrypoint
|
|
19
|
+
entrypoint (no test file — that's the composed test-framework generator's job, not
|
|
20
|
+
`base-package`'s).
|
|
21
|
+
- `dependencies` — adds user-supplied `dependencies`/`devDependencies` (each a `package-name`
|
|
22
|
+
or `package-name@version` string, e.g. `'lodash'` or `'lodash@4.17.21'`; scoped packages
|
|
23
|
+
supported, e.g. `'@scope/name@1.2.3'`) to `package.json`. Not prompted for interactively —
|
|
24
|
+
CLI/config-file only.
|
|
16
25
|
- `gitconfig` — composes `@sektek/base:gitconfig`, then layers JS-specific `.gitignore` rules.
|
|
17
|
-
- `typescript` — writes `tsconfig.json`/`tsconfig.build.json`
|
|
26
|
+
- `typescript` — writes `tsconfig.json`/`tsconfig.build.json` (its `compilerOptions.types`
|
|
27
|
+
reflects `testFramework`) and a TS entrypoint (likewise no test file of its own).
|
|
18
28
|
- `eslint` — writes `eslint.config.js`, composing `prettier`.
|
|
19
29
|
- `prettier` — writes `.prettierrc.js`/`.prettierignore`.
|
|
20
|
-
- `mocha` — writes `.mocharc.cjs` (and, for TypeScript, `.
|
|
30
|
+
- `mocha` — writes `.mocharc.cjs`/`.mocharc.min.cjs` (and, for TypeScript, `.nycrc.json` too)
|
|
31
|
+
plus a chai/BDD-style `index.spec.ts`/`index.spec.js` entrypoint.
|
|
32
|
+
- `vitest` — writes `vitest.config.ts` (one config for both JS and TS projects) plus an
|
|
33
|
+
`index.spec.ts`/`index.spec.js` entrypoint using vitest's own `expect` with chai-style
|
|
34
|
+
BDD assertions.
|
|
21
35
|
- `workspace` — the root-level, npm-workspaces variant of `app`.
|
|
22
36
|
|
|
23
37
|
## Installation
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import '../base-package/index.js';
|
|
2
|
+
import '../dependencies/index.js';
|
|
2
3
|
import '../gitconfig/index.js';
|
|
3
4
|
import '../typescript/index.js';
|
|
4
5
|
import '../eslint/index.js';
|
|
5
6
|
import '../mocha/index.js';
|
|
7
|
+
import '../vitest/index.js';
|
|
6
8
|
import { BaseConfig } from '../../lib/types/base-config.js';
|
|
7
9
|
import { BaseFeatures } from '../../lib/types/base-features.js';
|
|
8
10
|
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import '../base-package/index.js';
|
|
2
|
+
import '../dependencies/index.js';
|
|
2
3
|
import '../gitconfig/index.js';
|
|
3
4
|
import '../typescript/index.js';
|
|
4
5
|
import '../eslint/index.js';
|
|
5
6
|
import '../mocha/index.js';
|
|
7
|
+
import '../vitest/index.js';
|
|
6
8
|
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
7
9
|
const DEFAULT_FEATURES = {
|
|
8
10
|
unique: true,
|
|
@@ -13,7 +15,7 @@ export class AppGenerator extends BaseGenerator {
|
|
|
13
15
|
}
|
|
14
16
|
async taskInitializing() {
|
|
15
17
|
const { options } = this;
|
|
16
|
-
const { language } = options;
|
|
18
|
+
const { language, testFramework } = options;
|
|
17
19
|
await this.composeWith('@sektek/base:app', options, true);
|
|
18
20
|
await this.composeWith('gitconfig', options, true);
|
|
19
21
|
await this.composeWith('@sektek/base:devcontainer', options, true);
|
|
@@ -22,7 +24,13 @@ export class AppGenerator extends BaseGenerator {
|
|
|
22
24
|
await this.composeWith('typescript', options, true);
|
|
23
25
|
}
|
|
24
26
|
await this.composeWith('eslint', options, true);
|
|
25
|
-
|
|
27
|
+
if (testFramework === 'vitest') {
|
|
28
|
+
await this.composeWith('vitest', options, true);
|
|
29
|
+
}
|
|
30
|
+
else if (testFramework !== 'none') {
|
|
31
|
+
await this.composeWith('mocha', options, true);
|
|
32
|
+
}
|
|
33
|
+
await this.composeWith('dependencies', options, true);
|
|
26
34
|
}
|
|
27
35
|
}
|
|
28
36
|
export default AppGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/app/index.ts"],"names":[],"mappings":"AAAA,OAAO,0BAA0B,CAAC;AAClC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,wBAAwB,CAAC;AAChC,OAAO,oBAAoB,CAAC;AAC5B,OAAO,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/app/index.ts"],"names":[],"mappings":"AAAA,OAAO,0BAA0B,CAAC;AAClC,OAAO,0BAA0B,CAAC;AAClC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,wBAAwB,CAAC;AAChC,OAAO,oBAAoB,CAAC;AAC5B,OAAO,mBAAmB,CAAC;AAC3B,OAAO,oBAAoB,CAAC;AAI5B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,OAAO,YAAa,SAAQ,aAIjC;IACC,YACE,IAAc,EACd,OAAoB,EACpB,WAAyB,EAAkB;QAE3C,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;QAE5C,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,WAAW,CAAC,2BAA2B,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAEtD,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAEhD,IAAI,aAAa,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;YAEpC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QAGD,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { Prompt } from '@sektek/generator';
|
|
1
2
|
import { BaseConfig } from '../../lib/types/base-config.js';
|
|
2
3
|
import { BaseFeatures } from '../../lib/types/base-features.js';
|
|
3
4
|
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
4
5
|
import { BaseOptions } from '../../lib/types/base-options.js';
|
|
5
6
|
export declare class BasePackageGenerator extends BaseGenerator<BaseConfig, BaseOptions, BaseFeatures> {
|
|
7
|
+
static prompts(): Prompt[];
|
|
6
8
|
constructor(args: string[], options: BaseOptions, features?: BaseFeatures);
|
|
7
9
|
taskWriting(): void;
|
|
8
10
|
get packageName(): string;
|
|
@@ -1,12 +1,15 @@
|
|
|
1
|
+
import { authorPrompt } from '@sektek/generator';
|
|
1
2
|
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
2
3
|
const DEFAULT_FEATURES = {
|
|
3
4
|
unique: true,
|
|
4
5
|
};
|
|
5
6
|
const ENTRYPOINT_TEMPLATES = {
|
|
6
7
|
'index.js.ejs': 'index.js',
|
|
7
|
-
'index.spec.js.ejs': 'index.spec.js',
|
|
8
8
|
};
|
|
9
9
|
export class BasePackageGenerator extends BaseGenerator {
|
|
10
|
+
static prompts() {
|
|
11
|
+
return [authorPrompt];
|
|
12
|
+
}
|
|
10
13
|
constructor(args, options, features = {}) {
|
|
11
14
|
super(args, options, { ...DEFAULT_FEATURES, ...features });
|
|
12
15
|
}
|
|
@@ -23,7 +26,7 @@ export class BasePackageGenerator extends BaseGenerator {
|
|
|
23
26
|
});
|
|
24
27
|
if (language !== 'typescript') {
|
|
25
28
|
Object.entries(ENTRYPOINT_TEMPLATES).forEach(([template, destination]) => {
|
|
26
|
-
this.fs.copyTpl(this.templatePath(template), this.destinationPath(destination), {
|
|
29
|
+
this.fs.copyTpl(this.templatePath(template), this.destinationPath(destination), {});
|
|
27
30
|
});
|
|
28
31
|
}
|
|
29
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/base-package/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/base-package/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIzD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,cAAc,EAAE,UAAU;CAC3B,CAAC;AAEF,MAAM,OAAO,oBAAqB,SAAQ,aAIzC;IACC,MAAM,CAAC,OAAO;QACZ,OAAO,CAAC,YAAY,CAAC,CAAC;IACxB,CAAC;IAED,YACE,IAAc,EACd,OAAoB,EACpB,WAAyB,EAAkB;QAE3C,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,WAAW;QACT,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEvE,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EACrC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EACpC;YACE,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,kBAAkB,EAAE,IAAI,CAAC,WAAW;YACpC,UAAU,EAAE,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU;YACpE,OAAO;YACP,cAAc,EAAE,SAAS;YACzB,MAAM;SACP,CACF,CAAC;QAEF,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC9B,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAC1C,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE;gBAC1B,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC3B,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EACjC,EAAE,CACH,CAAC;YACJ,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,WAAW;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACxC,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { BaseConfig } from '../../lib/types/base-config.js';
|
|
2
|
+
import { BaseFeatures } from '../../lib/types/base-features.js';
|
|
3
|
+
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
4
|
+
import { BaseOptions } from '../../lib/types/base-options.js';
|
|
5
|
+
export declare class DependenciesGenerator extends BaseGenerator<BaseConfig, BaseOptions, BaseFeatures> {
|
|
6
|
+
constructor(args: string[], options: BaseOptions, features?: BaseFeatures);
|
|
7
|
+
taskDefault(): Promise<void>;
|
|
8
|
+
taskWriting(): void;
|
|
9
|
+
}
|
|
10
|
+
export default DependenciesGenerator;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
2
|
+
import { parseDependencySpec } from '../../lib/parse-dependency-spec.js';
|
|
3
|
+
const DEFAULT_FEATURES = {
|
|
4
|
+
unique: true,
|
|
5
|
+
};
|
|
6
|
+
export class DependenciesGenerator extends BaseGenerator {
|
|
7
|
+
constructor(args, options, features = {}) {
|
|
8
|
+
super(args, options, { ...DEFAULT_FEATURES, ...features });
|
|
9
|
+
}
|
|
10
|
+
async taskDefault() {
|
|
11
|
+
const { options } = this;
|
|
12
|
+
const { dependencies = [], devDependencies = [] } = options;
|
|
13
|
+
for (const spec of dependencies) {
|
|
14
|
+
const { name, version } = parseDependencySpec(spec);
|
|
15
|
+
await this.addDependency(name, version);
|
|
16
|
+
}
|
|
17
|
+
for (const spec of devDependencies) {
|
|
18
|
+
const { name, version } = parseDependencySpec(spec);
|
|
19
|
+
await this.addDevDependency(name, version);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
taskWriting() {
|
|
23
|
+
this.writeDependencies();
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export default DependenciesGenerator;
|
|
27
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/dependencies/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,OAAO,qBAAsB,SAAQ,aAI1C;IACC,YACE,IAAc,EACd,OAAoB,EACpB,WAAyB,EAAkB;QAE3C,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,EAAE,YAAY,GAAG,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QAE5D,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;YACnC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,WAAW;QACT,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,eAAe,qBAAqB,CAAC"}
|
|
@@ -34,6 +34,7 @@ export class MochaGenerator extends BaseGenerator {
|
|
|
34
34
|
if (language === 'typescript') {
|
|
35
35
|
this.fs.copyTpl(this.templatePath('nycrc.json.ejs'), this.destinationPath('.nycrc.json'), {});
|
|
36
36
|
}
|
|
37
|
+
this.fs.copyTpl(this.templatePath('index.spec.ejs'), this.destinationPath(`index.spec.${language === 'typescript' ? 'ts' : 'js'}`), { projectName: this.appname });
|
|
37
38
|
this.fs.extendJSON(this.destinationPath('package.json'), {
|
|
38
39
|
scripts: {
|
|
39
40
|
test: TEST_SCRIPT,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/mocha/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AACnD,MAAM,CAAC,MAAM,eAAe,GAAG,iCAAiC,CAAC;AAEjE,MAAM,OAAO,cAAe,SAAQ,aAInC;IACC,YACE,IAAc,EACd,OAAoB,EACpB,WAAyB,EAAkB;QAE3C,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAElC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAElC,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAC3C,MAAM,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;YACvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;YAGjD,MAAM,IAAI,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,WAAW;QACT,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAElC,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,EACpC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EACpC,EAAE,QAAQ,EAAE,CACb,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,EACxC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,EACxC,EAAE,CACH,CAAC;QAEF,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EACnC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EACnC,EAAE,CACH,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YACvD,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,eAAe;gBAC3B,YAAY,EAAE,iBAAiB;aAChC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,eAAe,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/mocha/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AACnD,MAAM,CAAC,MAAM,eAAe,GAAG,iCAAiC,CAAC;AAEjE,MAAM,OAAO,cAAe,SAAQ,aAInC;IACC,YACE,IAAc,EACd,OAAoB,EACpB,WAAyB,EAAkB;QAE3C,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAElC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAElC,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAC3C,MAAM,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;YACvD,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;YAGjD,MAAM,IAAI,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,WAAW;QACT,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAElC,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,EACpC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EACpC,EAAE,QAAQ,EAAE,CACb,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,EACxC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,EACxC,EAAE,CACH,CAAC;QAEF,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EACnC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EACnC,EAAE,CACH,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EACnC,IAAI,CAAC,eAAe,CAClB,cAAc,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CACxD,EACD,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,CAC9B,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YACvD,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,eAAe;gBAC3B,YAAY,EAAE,iBAAiB;aAChC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -9,8 +9,10 @@ const CONFIG_TEMPLATES = {
|
|
|
9
9
|
};
|
|
10
10
|
const ENTRYPOINT_TEMPLATES = {
|
|
11
11
|
'index.ts.ejs': 'index.ts',
|
|
12
|
-
'index.spec.ts.ejs': 'index.spec.ts',
|
|
13
12
|
};
|
|
13
|
+
const typesFor = (testFramework) => testFramework === 'vitest' || testFramework === 'none'
|
|
14
|
+
? ['node']
|
|
15
|
+
: ['mocha', 'node'];
|
|
14
16
|
export class TypescriptGenerator extends BaseGenerator {
|
|
15
17
|
constructor(args, options, features = {}) {
|
|
16
18
|
super(args, options, { ...DEFAULT_FEATURES, ...features });
|
|
@@ -21,11 +23,13 @@ export class TypescriptGenerator extends BaseGenerator {
|
|
|
21
23
|
await this.addDevDependency('@types/node');
|
|
22
24
|
}
|
|
23
25
|
taskWriting() {
|
|
26
|
+
const { testFramework } = this.options;
|
|
27
|
+
const types = typesFor(testFramework);
|
|
24
28
|
Object.entries(CONFIG_TEMPLATES).forEach(([template, destination]) => {
|
|
25
|
-
this.fs.copyTpl(this.templatePath(template), this.destinationPath(destination), {});
|
|
29
|
+
this.fs.copyTpl(this.templatePath(template), this.destinationPath(destination), { types });
|
|
26
30
|
});
|
|
27
31
|
Object.entries(ENTRYPOINT_TEMPLATES).forEach(([template, destination]) => {
|
|
28
|
-
this.fs.copyTpl(this.templatePath(template), this.destinationPath(destination), {
|
|
32
|
+
this.fs.copyTpl(this.templatePath(template), this.destinationPath(destination), {});
|
|
29
33
|
});
|
|
30
34
|
this.fs.extendJSON(this.destinationPath('package.json'), {
|
|
31
35
|
scripts: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/typescript/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,gCAAgC,CAAC;AAE7D,MAAM,gBAAgB,GAAG;IACvB,mBAAmB,EAAE,eAAe;IACpC,yBAAyB,EAAE,qBAAqB;CACjD,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,cAAc,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/typescript/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,gCAAgC,CAAC;AAE7D,MAAM,gBAAgB,GAAG;IACvB,mBAAmB,EAAE,eAAe;IACpC,yBAAyB,EAAE,qBAAqB;CACjD,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,cAAc,EAAE,UAAU;CAC3B,CAAC;AAgBF,MAAM,QAAQ,GAAG,CAAC,aAAiC,EAAE,EAAE,CACrD,aAAa,KAAK,QAAQ,IAAI,aAAa,KAAK,MAAM;IACpD,CAAC,CAAC,CAAC,MAAM,CAAC;IACV,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAExB,MAAM,OAAO,mBAAoB,SAAQ,aAIxC;IACC,YACE,IAAc,EACd,OAAoB,EACpB,WAAyB,EAAkB;QAE3C,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW;QACT,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEtC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE;YACnE,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC3B,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EACjC,EAAE,KAAK,EAAE,CACV,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE;YACvE,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC3B,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EACjC,EAAE,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YACvD,OAAO,EAAE;gBACP,KAAK,EAAE,YAAY;aACpB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,eAAe,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { BaseConfig } from '../../lib/types/base-config.js';
|
|
2
|
+
import { BaseFeatures } from '../../lib/types/base-features.js';
|
|
3
|
+
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
4
|
+
import { BaseOptions } from '../../lib/types/base-options.js';
|
|
5
|
+
export declare const TEST_SCRIPT = "vitest run";
|
|
6
|
+
export declare const TEST_WATCH_SCRIPT = "vitest";
|
|
7
|
+
export declare const TEST_COVER_SCRIPT = "vitest run --coverage";
|
|
8
|
+
export declare class VitestGenerator extends BaseGenerator<BaseConfig, BaseOptions, BaseFeatures> {
|
|
9
|
+
constructor(args: string[], options: BaseOptions, features?: BaseFeatures);
|
|
10
|
+
taskDefault(): Promise<void>;
|
|
11
|
+
taskWriting(): void;
|
|
12
|
+
}
|
|
13
|
+
export default VitestGenerator;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { BaseGenerator } from '../../lib/base-generator.js';
|
|
2
|
+
const DEFAULT_FEATURES = {
|
|
3
|
+
unique: true,
|
|
4
|
+
};
|
|
5
|
+
export const TEST_SCRIPT = 'vitest run';
|
|
6
|
+
export const TEST_WATCH_SCRIPT = 'vitest';
|
|
7
|
+
export const TEST_COVER_SCRIPT = 'vitest run --coverage';
|
|
8
|
+
export class VitestGenerator extends BaseGenerator {
|
|
9
|
+
constructor(args, options, features = {}) {
|
|
10
|
+
super(args, options, { ...DEFAULT_FEATURES, ...features });
|
|
11
|
+
}
|
|
12
|
+
async taskDefault() {
|
|
13
|
+
await this.addDevDependency('vitest');
|
|
14
|
+
await this.addDevDependency('@vitest/coverage-v8');
|
|
15
|
+
}
|
|
16
|
+
taskWriting() {
|
|
17
|
+
const { language } = this.options;
|
|
18
|
+
this.fs.copyTpl(this.templatePath('vitest.config.ts.ejs'), this.destinationPath('vitest.config.ts'), {});
|
|
19
|
+
this.fs.copyTpl(this.templatePath('index.spec.ejs'), this.destinationPath(`index.spec.${language === 'typescript' ? 'ts' : 'js'}`), { projectName: this.appname });
|
|
20
|
+
this.fs.extendJSON(this.destinationPath('package.json'), {
|
|
21
|
+
scripts: {
|
|
22
|
+
test: TEST_SCRIPT,
|
|
23
|
+
'test:watch': TEST_WATCH_SCRIPT,
|
|
24
|
+
'test:cover': TEST_COVER_SCRIPT,
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
this.writeDependencies();
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
export default VitestGenerator;
|
|
31
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../generators/vitest/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,gBAAgB,GAA0B;IAC9C,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC;AACxC,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAEzD,MAAM,OAAO,eAAgB,SAAQ,aAIpC;IACC,YACE,IAAc,EACd,OAAoB,EACpB,WAAyB,EAAkB;QAE3C,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IACrD,CAAC;IAED,WAAW;QACT,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAElC,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,EACzC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,EACxC,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,OAAO,CACb,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EACnC,IAAI,CAAC,eAAe,CAClB,cAAc,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CACxD,EACD,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,CAC9B,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YACvD,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW;gBACjB,YAAY,EAAE,iBAAiB;gBAC/B,YAAY,EAAE,iBAAiB;aAChC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { defineConfig } from 'vitest/config';
|
|
2
|
+
|
|
3
|
+
export default defineConfig({
|
|
4
|
+
test: {
|
|
5
|
+
include: ['**/*.spec.{js,ts}'],
|
|
6
|
+
coverage: {
|
|
7
|
+
provider: 'v8',
|
|
8
|
+
// Matches `mocha`'s `.nycrc.json` counting every source file toward
|
|
9
|
+
// coverage, not just ones a test happens to import — vitest's own
|
|
10
|
+
// `all`-style option was removed; setting `include` explicitly is the
|
|
11
|
+
// modern equivalent (v8/istanbul both honor it the same way).
|
|
12
|
+
include: ['index.{js,ts}', 'src/**/*.{js,ts}'],
|
|
13
|
+
thresholds: {
|
|
14
|
+
lines: 90,
|
|
15
|
+
branches: 90,
|
|
16
|
+
functions: 90,
|
|
17
|
+
statements: 90,
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
},
|
|
21
|
+
});
|
|
@@ -3,7 +3,6 @@ import { BaseConfig } from './types/base-config.js';
|
|
|
3
3
|
import { BaseFeatures } from './types/base-features.js';
|
|
4
4
|
import { BaseOptions } from './types/base-options.js';
|
|
5
5
|
export declare class BaseGenerator<C extends BaseConfig = BaseConfig, O extends BaseOptions = BaseOptions, F extends BaseFeatures = BaseFeatures> extends CoreGenerator<C, O, F> {
|
|
6
|
-
#private;
|
|
7
6
|
package: string;
|
|
8
7
|
dependencies: Record<string, string>;
|
|
9
8
|
devDependencies: Record<string, string>;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { CoreGenerator } from '@sektek/generator';
|
|
2
|
-
import
|
|
2
|
+
import { detectDependencyConflicts } from './detect-dependency-conflicts.js';
|
|
3
|
+
import { resolveDependencyVersion } from './version-resolver.js';
|
|
3
4
|
import { sortPackageJsonDependencies } from './sort-package-json-dependencies.js';
|
|
4
5
|
const DEFAULT_OPTIONS = {
|
|
5
6
|
packageScope: 'sektek',
|
|
6
|
-
author: 'Edward Kelly <eddie@sektek.net>',
|
|
7
7
|
license: 'UNLICENSED',
|
|
8
8
|
private: true,
|
|
9
9
|
};
|
|
@@ -21,25 +21,22 @@ export class BaseGenerator extends CoreGenerator {
|
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
async addDependency(name, version) {
|
|
24
|
-
this.dependencies[name] = await
|
|
24
|
+
this.dependencies[name] = await resolveDependencyVersion(name, version);
|
|
25
25
|
}
|
|
26
26
|
async addDevDependency(name, version) {
|
|
27
|
-
this.devDependencies[name] = await
|
|
28
|
-
}
|
|
29
|
-
async #resolveVersion(name, version) {
|
|
30
|
-
if (!version) {
|
|
31
|
-
return await latestVersion(name);
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
return await latestVersion(name, { version });
|
|
35
|
-
}
|
|
27
|
+
this.devDependencies[name] = await resolveDependencyVersion(name, version);
|
|
36
28
|
}
|
|
37
29
|
writeDependencies() {
|
|
38
30
|
const { dependencies, devDependencies } = this;
|
|
39
|
-
this.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
31
|
+
const packageJsonPath = this.destinationPath('package.json');
|
|
32
|
+
const existing = this.fs.readJSON(packageJsonPath, {});
|
|
33
|
+
for (const conflict of [
|
|
34
|
+
...detectDependencyConflicts('dependencies', existing.dependencies ?? {}, dependencies),
|
|
35
|
+
...detectDependencyConflicts('devDependencies', existing.devDependencies ?? {}, devDependencies),
|
|
36
|
+
]) {
|
|
37
|
+
this.log(`${conflict.section}["${conflict.name}"]: overwriting ${conflict.existingVersion} with ${conflict.newVersion}`);
|
|
38
|
+
}
|
|
39
|
+
this.fs.extendJSON(packageJsonPath, { dependencies, devDependencies });
|
|
43
40
|
}
|
|
44
41
|
}
|
|
45
42
|
export default BaseGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-generator.js","sourceRoot":"","sources":["../../lib/base-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"base-generator.js","sourceRoot":"","sources":["../../lib/base-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKlD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAIlF,MAAM,eAAe,GAAyB;IAC5C,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,IAAI;CACd,CAAC;AAEF,MAAM,OAAO,aAIX,SAAQ,aAAsB;IAC9B,OAAO,GAAG,YAAY,CAAC;IACvB,YAAY,GAA2B,EAAE,CAAC;IAC1C,eAAe,GAA2B,EAAE,CAAC;IAE7C,YAAY,IAAc,EAAE,OAAU,EAAE,QAAY;QAClD,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;QAE1D,IAAI,CAAC,SAAS,CAAC;YACb,MAAM,EAAE,GAAG,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC;YAC/C,QAAQ,EAAE,6BAA6B;YACvC,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,OAAgB;QAChD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,OAAgB;QACnD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,MAAM,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAGpD,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI;YACrB,GAAG,yBAAyB,CAC1B,cAAc,EACd,QAAQ,CAAC,YAAY,IAAI,EAAE,EAC3B,YAAY,CACb;YACD,GAAG,yBAAyB,CAC1B,iBAAiB,EACjB,QAAQ,CAAC,eAAe,IAAI,EAAE,EAC9B,eAAe,CAChB;SACF,EAAE,CAAC;YACF,IAAI,CAAC,GAAG,CACN,GAAG,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,IAAI,mBAAmB,QAAQ,CAAC,eAAe,SAAS,QAAQ,CAAC,UAAU,EAAE,CAC/G,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,CAAC;IACzE,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export type DependencySection = 'dependencies' | 'devDependencies';
|
|
2
|
+
export type DependencyConflict = {
|
|
3
|
+
section: DependencySection;
|
|
4
|
+
name: string;
|
|
5
|
+
existingVersion: string;
|
|
6
|
+
newVersion: string;
|
|
7
|
+
};
|
|
8
|
+
export declare function detectDependencyConflicts(section: DependencySection, existing: Record<string, string>, incoming: Record<string, string>): DependencyConflict[];
|
|
9
|
+
export default detectDependencyConflicts;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export function detectDependencyConflicts(section, existing, incoming) {
|
|
2
|
+
const conflicts = [];
|
|
3
|
+
for (const [name, newVersion] of Object.entries(incoming)) {
|
|
4
|
+
const existingVersion = existing[name];
|
|
5
|
+
if (existingVersion !== undefined && existingVersion !== newVersion) {
|
|
6
|
+
conflicts.push({ section, name, existingVersion, newVersion });
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
return conflicts;
|
|
10
|
+
}
|
|
11
|
+
export default detectDependencyConflicts;
|
|
12
|
+
//# sourceMappingURL=detect-dependency-conflicts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detect-dependency-conflicts.js","sourceRoot":"","sources":["../../lib/detect-dependency-conflicts.ts"],"names":[],"mappings":"AAkBA,MAAM,UAAU,yBAAyB,CACvC,OAA0B,EAC1B,QAAgC,EAChC,QAAgC;IAEhC,MAAM,SAAS,GAAyB,EAAE,CAAC;IAE3C,KAAK,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,KAAK,UAAU,EAAE,CAAC;YACpE,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,eAAe,yBAAyB,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export const parseDependencySpec = (spec) => {
|
|
2
|
+
const lastAt = spec.lastIndexOf('@');
|
|
3
|
+
if (lastAt <= 0) {
|
|
4
|
+
return { name: spec };
|
|
5
|
+
}
|
|
6
|
+
const name = spec.slice(0, lastAt);
|
|
7
|
+
const version = spec.slice(lastAt + 1);
|
|
8
|
+
return version === '' ? { name } : { name, version };
|
|
9
|
+
};
|
|
10
|
+
export default parseDependencySpec;
|
|
11
|
+
//# sourceMappingURL=parse-dependency-spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-dependency-spec.js","sourceRoot":"","sources":["../../lib/parse-dependency-spec.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAkB,EAAE;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAErC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAChB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvC,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AACvD,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { type Options } from 'latest-version';
|
|
2
|
+
export type VersionResolver = (name: string, version?: string) => Promise<string>;
|
|
3
|
+
type LatestVersionFetcher = (name: string, options?: Options) => Promise<string>;
|
|
4
|
+
export declare function resolveLatestVersion(name: string, version?: string): Promise<string>;
|
|
5
|
+
export declare function resolveDependencyVersion(name: string, version?: string): Promise<string>;
|
|
6
|
+
export declare function setVersionResolverForTesting(testResolver: VersionResolver): void;
|
|
7
|
+
export declare function setLatestVersionFetcherForTesting(fetcher: LatestVersionFetcher): void;
|
|
8
|
+
export default resolveDependencyVersion;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import latestVersion from 'latest-version';
|
|
2
|
+
const RANGE_OPERATOR_PATTERN = /[\^~=<>|*]|(?:^|\.)[xX](?:\.|$)|\s/;
|
|
3
|
+
function hasExplicitRange(version) {
|
|
4
|
+
return RANGE_OPERATOR_PATTERN.test(version);
|
|
5
|
+
}
|
|
6
|
+
let fetchLatestVersion = latestVersion;
|
|
7
|
+
export async function resolveLatestVersion(name, version) {
|
|
8
|
+
if (version !== undefined && hasExplicitRange(version)) {
|
|
9
|
+
return version;
|
|
10
|
+
}
|
|
11
|
+
const resolved = version
|
|
12
|
+
? await fetchLatestVersion(name, { version })
|
|
13
|
+
: await fetchLatestVersion(name);
|
|
14
|
+
return `^${resolved}`;
|
|
15
|
+
}
|
|
16
|
+
let resolver = resolveLatestVersion;
|
|
17
|
+
export function resolveDependencyVersion(name, version) {
|
|
18
|
+
return resolver(name, version);
|
|
19
|
+
}
|
|
20
|
+
export function setVersionResolverForTesting(testResolver) {
|
|
21
|
+
resolver = testResolver;
|
|
22
|
+
}
|
|
23
|
+
export function setLatestVersionFetcherForTesting(fetcher) {
|
|
24
|
+
fetchLatestVersion = fetcher;
|
|
25
|
+
}
|
|
26
|
+
export default resolveDependencyVersion;
|
|
27
|
+
//# sourceMappingURL=version-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version-resolver.js","sourceRoot":"","sources":["../../lib/version-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,aAA+B,MAAM,gBAAgB,CAAC;AAU7D,MAAM,sBAAsB,GAAG,oCAAoC,CAAC;AAEpE,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAOD,IAAI,kBAAkB,GAAyB,aAAa,CAAC;AAa7D,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAY,EACZ,OAAgB;IAEhB,IAAI,OAAO,KAAK,SAAS,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO;QACtB,CAAC,CAAC,MAAM,kBAAkB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;QAC7C,CAAC,CAAC,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,IAAI,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,IAAI,QAAQ,GAAoB,oBAAoB,CAAC;AAWrD,MAAM,UAAU,wBAAwB,CACtC,IAAY,EACZ,OAAgB;IAEhB,OAAO,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACjC,CAAC;AASD,MAAM,UAAU,4BAA4B,CAC1C,YAA6B;IAE7B,QAAQ,GAAG,YAAY,CAAC;AAC1B,CAAC;AASD,MAAM,UAAU,iCAAiC,CAC/C,OAA6B;IAE7B,kBAAkB,GAAG,OAAO,CAAC;AAC/B,CAAC;AAED,eAAe,wBAAwB,CAAC"}
|
package/dist/manifest.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const GENERATORS: readonly ["app", "base-package", "gitconfig", "typescript", "eslint", "prettier", "mocha", "workspace"];
|
|
1
|
+
export declare const GENERATORS: readonly ["app", "base-package", "dependencies", "gitconfig", "typescript", "eslint", "prettier", "mocha", "vitest", "workspace"];
|
package/dist/manifest.js
CHANGED
package/dist/manifest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../manifest.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,KAAK;IACL,cAAc;IACd,WAAW;IACX,YAAY;IACZ,QAAQ;IACR,UAAU;IACV,OAAO;IACP,WAAW;CACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../manifest.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,KAAK;IACL,cAAc;IACd,cAAc;IACd,WAAW;IACX,YAAY;IACZ,QAAQ;IACR,UAAU;IACV,OAAO;IACP,QAAQ;IACR,WAAW;CACH,CAAC"}
|