@typespec/compiler 0.66.0-dev.8 → 0.66.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/dist/generated-defs/TypeSpec.d.ts +68 -9
- package/dist/generated-defs/TypeSpec.d.ts.map +1 -1
- package/dist/manifest.js +2 -2
- package/dist/src/core/checker.d.ts +1 -1
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +134 -57
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/cli/actions/compile/args.d.ts +1 -0
- package/dist/src/core/cli/actions/compile/args.d.ts.map +1 -1
- package/dist/src/core/cli/actions/compile/args.js +3 -0
- package/dist/src/core/cli/actions/compile/args.js.map +1 -1
- package/dist/src/core/cli/actions/compile/compile.d.ts.map +1 -1
- package/dist/src/core/cli/actions/compile/compile.js +4 -1
- package/dist/src/core/cli/actions/compile/compile.js.map +1 -1
- package/dist/src/core/cli/actions/info.js +2 -2
- package/dist/src/core/cli/actions/info.js.map +1 -1
- package/dist/src/core/cli/cli.js +7 -3
- package/dist/src/core/cli/cli.js.map +1 -1
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.d.ts +6 -0
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.d.ts.map +1 -0
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.js +45 -0
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.js.map +1 -0
- package/dist/src/core/emitter-utils.d.ts +1 -0
- package/dist/src/core/emitter-utils.d.ts.map +1 -1
- package/dist/src/core/emitter-utils.js +6 -1
- package/dist/src/core/emitter-utils.js.map +1 -1
- package/dist/src/core/helpers/discriminator-utils.d.ts +16 -2
- package/dist/src/core/helpers/discriminator-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/discriminator-utils.js +80 -10
- package/dist/src/core/helpers/discriminator-utils.js.map +1 -1
- package/dist/src/core/helpers/index.d.ts +1 -1
- package/dist/src/core/helpers/index.d.ts.map +1 -1
- package/dist/src/core/helpers/index.js +1 -1
- package/dist/src/core/helpers/index.js.map +1 -1
- package/dist/src/core/install.d.ts +1 -1
- package/dist/src/core/install.d.ts.map +1 -1
- package/dist/src/core/install.js +22 -6
- package/dist/src/core/install.js.map +1 -1
- package/dist/src/core/intrinsic-type-state.d.ts +2 -0
- package/dist/src/core/intrinsic-type-state.d.ts.map +1 -1
- package/dist/src/core/intrinsic-type-state.js +2 -0
- package/dist/src/core/intrinsic-type-state.js.map +1 -1
- package/dist/src/core/linter-rules/unused-template-parameter.rule.d.ts +2 -0
- package/dist/src/core/linter-rules/unused-template-parameter.rule.d.ts.map +1 -0
- package/dist/src/core/linter-rules/unused-template-parameter.rule.js +36 -0
- package/dist/src/core/linter-rules/unused-template-parameter.rule.js.map +1 -0
- package/dist/src/core/linter-rules/unused-using.rule.d.ts +2 -0
- package/dist/src/core/linter-rules/unused-using.rule.d.ts.map +1 -0
- package/dist/src/core/linter-rules/unused-using.rule.js +38 -0
- package/dist/src/core/linter-rules/unused-using.rule.js.map +1 -0
- package/dist/src/core/linter.d.ts +0 -1
- package/dist/src/core/linter.d.ts.map +1 -1
- package/dist/src/core/linter.js +7 -39
- package/dist/src/core/linter.js.map +1 -1
- package/dist/src/core/logger/console-sink.browser.d.ts.map +1 -1
- package/dist/src/core/logger/console-sink.browser.js +16 -0
- package/dist/src/core/logger/console-sink.browser.js.map +1 -1
- package/dist/src/core/logger/console-sink.d.ts +2 -0
- package/dist/src/core/logger/console-sink.d.ts.map +1 -1
- package/dist/src/core/logger/console-sink.js +55 -0
- package/dist/src/core/logger/console-sink.js.map +1 -1
- package/dist/src/core/logger/logger.d.ts.map +1 -1
- package/dist/src/core/logger/logger.js +1 -0
- package/dist/src/core/logger/logger.js.map +1 -1
- package/dist/src/core/messages.d.ts +88 -7
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +22 -1
- package/dist/src/core/messages.js.map +1 -1
- package/dist/src/core/options.d.ts +4 -0
- package/dist/src/core/options.d.ts.map +1 -1
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +55 -29
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/types.d.ts +1 -0
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/visibility/core.d.ts +2 -2
- package/dist/src/core/visibility/core.d.ts.map +1 -1
- package/dist/src/core/visibility/core.js +4 -3
- package/dist/src/core/visibility/core.js.map +1 -1
- package/dist/src/experimental/mutators.js +9 -2
- package/dist/src/experimental/mutators.js.map +1 -1
- package/dist/src/experimental/realm.d.ts +0 -1
- package/dist/src/experimental/realm.d.ts.map +1 -1
- package/dist/src/experimental/realm.js +0 -5
- package/dist/src/experimental/realm.js.map +1 -1
- package/dist/src/experimental/typekit/kits/model.js +0 -1
- package/dist/src/experimental/typekit/kits/model.js.map +1 -1
- package/dist/src/experimental/typekit/kits/type.d.ts +2 -1
- package/dist/src/experimental/typekit/kits/type.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/type.js +4 -11
- package/dist/src/experimental/typekit/kits/type.js.map +1 -1
- package/dist/src/init/file-templating.d.ts +2 -0
- package/dist/src/init/file-templating.d.ts.map +1 -1
- package/dist/src/init/file-templating.js +3 -0
- package/dist/src/init/file-templating.js.map +1 -1
- package/dist/src/init/init-template.d.ts +2 -0
- package/dist/src/init/init-template.d.ts.map +1 -1
- package/dist/src/init/init-template.js +1 -0
- package/dist/src/init/init-template.js.map +1 -1
- package/dist/src/init/init.d.ts +5 -2
- package/dist/src/init/init.d.ts.map +1 -1
- package/dist/src/init/init.js +158 -89
- package/dist/src/init/init.js.map +1 -1
- package/dist/src/init/prompts.d.ts +5 -0
- package/dist/src/init/prompts.d.ts.map +1 -0
- package/dist/src/init/prompts.js +16 -0
- package/dist/src/init/prompts.js.map +1 -0
- package/dist/src/init/scaffold.d.ts +1 -5
- package/dist/src/init/scaffold.d.ts.map +1 -1
- package/dist/src/init/scaffold.js +0 -1
- package/dist/src/init/scaffold.js.map +1 -1
- package/dist/src/lib/decorators.d.ts +2 -1
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +12 -1
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/lib/service.d.ts +1 -1
- package/dist/src/lib/service.d.ts.map +1 -1
- package/dist/src/lib/service.js +4 -40
- package/dist/src/lib/service.js.map +1 -1
- package/dist/src/lib/tsp-index.d.ts.map +1 -1
- package/dist/src/lib/tsp-index.js +2 -1
- package/dist/src/lib/tsp-index.js.map +1 -1
- package/dist/src/lib/visibility.d.ts +2 -2
- package/dist/src/lib/visibility.d.ts.map +1 -1
- package/dist/src/lib/visibility.js +109 -7
- package/dist/src/lib/visibility.js.map +1 -1
- package/dist/src/server/compile-service.d.ts.map +1 -1
- package/dist/src/server/compile-service.js +11 -1
- package/dist/src/server/compile-service.js.map +1 -1
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +37 -17
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/tmlanguage.js +1 -1
- package/dist/src/server/tmlanguage.js.map +1 -1
- package/dist/src/testing/test-host.js +1 -1
- package/dist/src/testing/test-host.js.map +1 -1
- package/dist/typespec.tmLanguage +3 -3
- package/lib/std/decorators.tsp +78 -9
- package/lib/std/types.tsp +1 -1
- package/package.json +7 -7
- package/templates/__snapshots__/rest/main.tsp +1 -3
- package/templates/rest/main.tsp +1 -3
- package/templates/scaffolding.json +20 -22
|
@@ -106,7 +106,6 @@ export class Realm {
|
|
|
106
106
|
constructor(program, description) {
|
|
107
107
|
this.key = Symbol(description);
|
|
108
108
|
this.#program = program;
|
|
109
|
-
_a.#knownRealms.set(this.key, this);
|
|
110
109
|
}
|
|
111
110
|
#_typekit;
|
|
112
111
|
/**
|
|
@@ -193,10 +192,6 @@ export class Realm {
|
|
|
193
192
|
get types() {
|
|
194
193
|
return this.#types;
|
|
195
194
|
}
|
|
196
|
-
static #knownRealms = new Map();
|
|
197
|
-
static realmForKey(key, parentRealm) {
|
|
198
|
-
return this.#knownRealms.get(key);
|
|
199
|
-
}
|
|
200
195
|
static realmForType = new WeakMap();
|
|
201
196
|
}
|
|
202
197
|
_a = Realm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"realm.js","sourceRoot":"","sources":["../../../src/experimental/realm.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"realm.js","sourceRoot":"","sources":["../../../src/experimental/realm.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ defineKit({
|
|
|
12
12
|
name: desc.name ?? "",
|
|
13
13
|
decorators: decoratorApplication(this, desc.decorators),
|
|
14
14
|
properties: properties,
|
|
15
|
-
expression: desc.name === undefined,
|
|
16
15
|
node: undefined,
|
|
17
16
|
derivedModels: desc.derivedModels ?? [],
|
|
18
17
|
sourceModels: desc.sourceModels ?? [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AASjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAiB,MAAM,aAAa,CAAC;AA8G3E,MAAM,WAAW,GAAG,IAAI,GAAG,EAAgB,CAAC;AAC5C,SAAS,CAAmB;IAC1B,KAAK,EAAE;QACL,MAAM,CAAC,IAAI;YACT,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,KAAK,GAAU,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACnD,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;gBACrB,UAAU,EAAE,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC;gBACvD,UAAU,EAAE,UAAU;gBACtB,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DiscriminatedUnion } from "../../../core/helpers/discriminator-utils.js";
|
|
1
2
|
import { Discriminator } from "../../../core/intrinsic-type-state.js";
|
|
2
3
|
import { Enum, Model, Scalar, Union, type Type } from "../../../core/types.js";
|
|
3
4
|
/** @experimental */
|
|
@@ -46,7 +47,7 @@ export interface TypeTypekit {
|
|
|
46
47
|
* Resolves a discriminated union for the given model or union.
|
|
47
48
|
* @param type Model or Union to resolve the discriminated union for.
|
|
48
49
|
*/
|
|
49
|
-
getDiscriminatedUnion(type:
|
|
50
|
+
getDiscriminatedUnion(type: Union): DiscriminatedUnion | undefined;
|
|
50
51
|
/**
|
|
51
52
|
* Resolves the discriminator for a discriminated union. Returns undefined if the type is not a discriminated union.
|
|
52
53
|
* @param type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAEnB,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EACL,aAAa,EAUd,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAO/E,qBAAqB;AACrB,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,KAAK,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;IAClC;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAC7B;;OAEG;IACH,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAExE;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAE3C;;;;;OAKG;IACH,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACvC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;IAC9D;;;OAGG;IACH,qBAAqB,CAAC,IAAI,EAAE,KAAK,GAAG,kBAAkB,GAAG,SAAS,CAAC;IACnE;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,aAAa,GAAG,SAAS,CAAC;IACjE;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAEzC;;;OAGG;IACH,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAElD;;;OAGG;IACH,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAElD;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAC1C;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAC7B;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;CACpC;AAED,UAAU,gBAAgB;IACxB;;;OAGG;IACH,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,OAAO,QAAQ,kBAAkB,CAAC;IAChC,UAAU,OAAQ,SAAQ,gBAAgB;KAAG;CAC9C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getDiscriminatedUnion } from "../../../core/helpers/discriminator-utils.js";
|
|
1
|
+
import { getDiscriminatedUnion, } from "../../../core/helpers/discriminator-utils.js";
|
|
2
2
|
import { getLocationContext } from "../../../core/index.js";
|
|
3
3
|
import { getDiscriminator, getMaxItems, getMaxLength, getMaxValue, getMaxValueExclusive, getMinItems, getMinLength, getMinValue, getMinValueExclusive, } from "../../../core/intrinsic-type-state.js";
|
|
4
4
|
import { isErrorType, isNeverType } from "../../../core/type-utils.js";
|
|
@@ -20,6 +20,7 @@ defineKit({
|
|
|
20
20
|
...type,
|
|
21
21
|
decorators: [...type.decorators],
|
|
22
22
|
derivedModels: [...type.derivedModels],
|
|
23
|
+
sourceModels: type.sourceModels.map((x) => ({ ...x })),
|
|
23
24
|
properties: copyMap(type.properties),
|
|
24
25
|
indexer: type.indexer ? { ...type.indexer } : undefined,
|
|
25
26
|
});
|
|
@@ -105,16 +106,8 @@ defineKit({
|
|
|
105
106
|
return getDiscriminator(this.program, type);
|
|
106
107
|
},
|
|
107
108
|
getDiscriminatedUnion(type) {
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
return undefined;
|
|
111
|
-
}
|
|
112
|
-
const [union] = getDiscriminatedUnion(type, discriminator);
|
|
113
|
-
const variants = Array.from(union.variants.entries()).map(([k, v]) => this.unionVariant.create({ name: k, type: v }));
|
|
114
|
-
return this.union.create({
|
|
115
|
-
name: union.propertyName,
|
|
116
|
-
variants,
|
|
117
|
-
});
|
|
109
|
+
const [union] = getDiscriminatedUnion(this.program, type);
|
|
110
|
+
return union;
|
|
118
111
|
},
|
|
119
112
|
maxValue(type) {
|
|
120
113
|
return getMaxValue(this.program, type);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { InitTemplate } from "./init-template.js";
|
|
2
2
|
import type { ScaffoldingConfig } from "./scaffold.js";
|
|
3
3
|
export type FileTemplatingContext = Omit<InitTemplate, "libraries"> & ScaffoldingConfig & {
|
|
4
|
+
/** Name of the folder */
|
|
5
|
+
folderName: string;
|
|
4
6
|
casing: CasingUtils;
|
|
5
7
|
/**
|
|
6
8
|
* NormalizeVersion function replaces `-` with `_`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-templating.d.ts","sourceRoot":"","sources":["../../../src/init/file-templating.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-templating.d.ts","sourceRoot":"","sources":["../../../src/init/file-templating.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GACjE,iBAAiB,GAAG;IAClB,yBAAyB;IACzB,UAAU,EAAE,MAAM,CAAC;IAEnB,MAAM,EAAE,WAAW,CAAC;IACpB;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC;IAE9D;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC;IAEzD;;OAEG;IACH,oBAAoB,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC;CACnE,CAAC;AAEJ,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,KAAK,MAAM,CAAC;IACrF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,KAAK,MAAM,CAAC;IACtF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,KAAK,MAAM,CAAC;CACtF;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,iBAAiB,GAAG,qBAAqB,CAW5F;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAE9E"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { camelCase, kebabCase, pascalCase } from "change-case";
|
|
2
2
|
import Mustache from "mustache";
|
|
3
|
+
import { getBaseFileName } from "../core/path-utils.js";
|
|
3
4
|
export function createFileTemplatingContext(config) {
|
|
5
|
+
const folderName = getBaseFileName(config.directory);
|
|
4
6
|
return {
|
|
5
7
|
...config.template,
|
|
6
8
|
...config,
|
|
9
|
+
folderName,
|
|
7
10
|
normalizeVersion,
|
|
8
11
|
toLowerCase,
|
|
9
12
|
normalizePackageName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-templating.js","sourceRoot":"","sources":["../../../src/init/file-templating.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,QAAQ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"file-templating.js","sourceRoot":"","sources":["../../../src/init/file-templating.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAgCxD,MAAM,UAAU,2BAA2B,CAAC,MAAyB;IACnE,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACrD,OAAO;QACL,GAAG,MAAM,CAAC,QAAQ;QAClB,GAAG,MAAM;QACT,UAAU;QACV,gBAAgB;QAChB,WAAW;QACX,oBAAoB;QACpB,MAAM;KACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,OAAe,EAAE,OAA8B;IACpE,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,MAAM,GAAgB;IAC1B,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;IACvC,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;IACvC,UAAU,EAAE,iBAAiB,CAAC,UAAU,CAAC;CAC1C,CAAC;AAEF,SAAS,iBAAiB,CAAC,EAA4B;IACrD,OAAO,GAAG,EAAE,CAAC,CAAC,IAAY,EAAE,MAAgC,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,gBAAgB,GAAG;IACvB,OAAO,UAAU,IAAY,EAAE,MAAW;QACxC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG;IAClB,OAAO,UAAU,IAAY,EAAE,MAAW;QACxC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,OAAO,UAAU,IAAY,EAAE,MAAW;QACxC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -51,6 +51,8 @@ export interface InitTemplate {
|
|
|
51
51
|
* Describes emitter dependencies that will be added to the generated project.
|
|
52
52
|
*/
|
|
53
53
|
export interface EmitterTemplate {
|
|
54
|
+
/** Friendly name for the emitter */
|
|
55
|
+
label?: string;
|
|
54
56
|
/** Emitter Selection Description */
|
|
55
57
|
description?: string;
|
|
56
58
|
/** Whether emitter is selected by default in the list */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-template.d.ts","sourceRoot":"","sources":["../../../src/init/init-template.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,GAAG,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,SAAS,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAE3C;;OAEG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAE3C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,uBAAuB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC,uBAAuB,CAQjF,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"init-template.d.ts","sourceRoot":"","sources":["../../../src/init/init-template.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,GAAG,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,SAAS,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAE3C;;OAEG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAE3C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,uBAAuB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC,uBAAuB,CAQjF,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,YAAY,CA8D3D,CAAC"}
|
|
@@ -28,6 +28,7 @@ export const InitTemplateSchema = {
|
|
|
28
28
|
additionalProperties: {
|
|
29
29
|
type: "object",
|
|
30
30
|
properties: {
|
|
31
|
+
label: { type: "string", nullable: true },
|
|
31
32
|
description: { type: "string", nullable: true },
|
|
32
33
|
selected: { type: "boolean", nullable: true },
|
|
33
34
|
options: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-template.js","sourceRoot":"","sources":["../../../src/init/init-template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"init-template.js","sourceRoot":"","sources":["../../../src/init/init-template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAmGtE,MAAM,CAAC,MAAM,6BAA6B,GAA4C;IACpF,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC5C;IACD,QAAQ,EAAE,CAAC,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAiC;IAC9D,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC/B,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACnD,SAAS,EAAE;YACT,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,6BAA6B,CAAC;aAC3D;YACD,QAAQ,EAAE,IAAI;SACf;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,oBAAoB,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACzC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC/C,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC7C,OAAO,EAAE,EAAS;oBAClB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC3C,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC5C;gBACD,QAAQ,EAAE,EAAE;aACb;YACD,QAAQ,EAAE,EAAE;SACb;QACD,mBAAmB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QACxD,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,wBAAwB,EAAE;QACvD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,oBAAoB,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC/B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE;oBACxC,YAAY,EAAE,EAAS;iBACxB;gBACD,QAAQ,EAAE,CAAC,aAAa,EAAE,MAAM,CAAC;aAClC;YACD,QAAQ,EAAE,EAAE;SACb;QACD,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACxB,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC/B,cAAc,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACpD;gBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;aAClC;SACF;KACF;IACD,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC;CACnC,CAAC"}
|
package/dist/src/init/init.d.ts
CHANGED
|
@@ -2,10 +2,11 @@ import { CliCompilerHost } from "../core/cli/types.js";
|
|
|
2
2
|
import { Diagnostic, SourceFile } from "../core/types.js";
|
|
3
3
|
import { InitTemplate } from "./init-template.js";
|
|
4
4
|
export interface InitTypeSpecProjectOptions {
|
|
5
|
-
templatesUrl?: string;
|
|
6
|
-
template?: string;
|
|
5
|
+
readonly templatesUrl?: string;
|
|
6
|
+
readonly template?: string;
|
|
7
7
|
}
|
|
8
8
|
export declare function initTypeSpecProject(host: CliCompilerHost, directory: string, options?: InitTypeSpecProjectOptions): Promise<void>;
|
|
9
|
+
export declare function initTypeSpecProjectWorker(host: CliCompilerHost, directory: string, options?: InitTypeSpecProjectOptions): Promise<void>;
|
|
9
10
|
export interface LoadedTemplate {
|
|
10
11
|
readonly baseUri: string;
|
|
11
12
|
readonly templates: Record<string, InitTemplate>;
|
|
@@ -20,4 +21,6 @@ export declare class InitTemplateError extends Error {
|
|
|
20
21
|
diagnostics: readonly Diagnostic[];
|
|
21
22
|
constructor(diagnostics: readonly Diagnostic[]);
|
|
22
23
|
}
|
|
24
|
+
export declare const spinnerFrames: string[];
|
|
25
|
+
export declare function createSpinner(): () => string;
|
|
23
26
|
//# sourceMappingURL=init.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/init/init.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,OAAO,EAAgB,UAAU,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAKlF,OAAO,EAAmB,YAAY,
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/init/init.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,OAAO,EAAgB,UAAU,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAKlF,OAAO,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAInE,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,0BAA+B,iBAYzC;AACD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,0BAA+B,iBA2EzC;AA2DD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC3B;AAmKD;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IACvB,WAAW,EAAE,SAAS,UAAU,EAAE;gBAAlC,WAAW,EAAE,SAAS,UAAU,EAAE;CAGtD;AAiDD,eAAO,MAAM,aAAa,UAED,CAAC;AAE1B,wBAAgB,aAAa,iBAO5B"}
|
package/dist/src/init/init.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { confirm as confirmInquirer, input, select } from "@inquirer/prompts";
|
|
1
2
|
import { readdir } from "fs/promises";
|
|
2
3
|
import pc from "picocolors";
|
|
3
|
-
import prompts from "prompts";
|
|
4
4
|
import * as semver from "semver";
|
|
5
5
|
import { installTypeSpecDependencies } from "../core/install.js";
|
|
6
6
|
import { createDiagnostic } from "../core/messages.js";
|
|
@@ -10,8 +10,24 @@ import { MANIFEST } from "../manifest.js";
|
|
|
10
10
|
import { readUrlOrPath } from "../utils/misc.js";
|
|
11
11
|
import { getTypeSpecCoreTemplates } from "./core-templates.js";
|
|
12
12
|
import { validateTemplateDefinitions } from "./init-template-validate.js";
|
|
13
|
-
import {
|
|
13
|
+
import { checkbox } from "./prompts.js";
|
|
14
|
+
import { isFileSkipGeneration, makeScaffoldingConfig, scaffoldNewProject } from "./scaffold.js";
|
|
14
15
|
export async function initTypeSpecProject(host, directory, options = {}) {
|
|
16
|
+
try {
|
|
17
|
+
await initTypeSpecProjectWorker(host, directory, options);
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
if (error instanceof Error && error.name === "ExitPromptError") {
|
|
21
|
+
warning("interrupted, until next time!");
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
// Rethrow unknown errors
|
|
25
|
+
throw error;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
export async function initTypeSpecProjectWorker(host, directory, options = {}) {
|
|
30
|
+
whiteline();
|
|
15
31
|
if (!(await confirmDirectoryEmpty(directory))) {
|
|
16
32
|
return;
|
|
17
33
|
}
|
|
@@ -29,48 +45,29 @@ export async function initTypeSpecProject(host, directory, options = {}) {
|
|
|
29
45
|
return;
|
|
30
46
|
}
|
|
31
47
|
const template = result.templates[templateName];
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
const { name, includeGitignore } = await prompts([
|
|
37
|
-
{
|
|
38
|
-
type: "text",
|
|
39
|
-
name: "name",
|
|
40
|
-
message: `Project name`,
|
|
41
|
-
initial: folderName,
|
|
42
|
-
},
|
|
43
|
-
{
|
|
44
|
-
type: "confirm",
|
|
45
|
-
name: "includeGitignore",
|
|
46
|
-
message: "Do you want to generate a .gitignore file?",
|
|
47
|
-
initial: true,
|
|
48
|
-
},
|
|
49
|
-
]);
|
|
50
|
-
const libraries = await selectLibraries(template);
|
|
48
|
+
const name = await input({
|
|
49
|
+
message: `Enter a project name:`,
|
|
50
|
+
default: folderName,
|
|
51
|
+
});
|
|
51
52
|
const emitters = await selectEmitters(template);
|
|
52
53
|
const parameters = await promptCustomParameters(template);
|
|
53
54
|
const scaffoldingConfig = makeScaffoldingConfig(template, {
|
|
54
55
|
baseUri: result.baseUri,
|
|
55
|
-
libraries,
|
|
56
56
|
name,
|
|
57
57
|
directory,
|
|
58
|
-
folderName,
|
|
59
58
|
parameters,
|
|
60
|
-
includeGitignore,
|
|
61
59
|
emitters,
|
|
62
60
|
});
|
|
63
61
|
await scaffoldNewProject(host, scaffoldingConfig);
|
|
64
62
|
const projectJsonCreated = !isFileSkipGeneration("package.json", scaffoldingConfig.template.files ?? []);
|
|
65
|
-
|
|
66
|
-
console.log("");
|
|
67
|
-
// eslint-disable-next-line no-console
|
|
68
|
-
console.log(pc.green("Project created successfully."));
|
|
63
|
+
whiteline();
|
|
69
64
|
if (projectJsonCreated) {
|
|
70
|
-
|
|
71
|
-
console.log(pc.green("Installing dependencies..."));
|
|
72
|
-
await installTypeSpecDependencies(host, directory);
|
|
65
|
+
await action("Installing dependencies", async () => await installTypeSpecDependencies(host, directory, "pipe"));
|
|
73
66
|
}
|
|
67
|
+
whiteline();
|
|
68
|
+
success("Project initialized!");
|
|
69
|
+
// eslint-disable-next-line no-console
|
|
70
|
+
console.log(`Run ${pc.cyan(`tsp compile .`)} to run TypeSpec.`);
|
|
74
71
|
if (Object.values(emitters).some((emitter) => emitter.message !== undefined)) {
|
|
75
72
|
// eslint-disable-next-line no-console
|
|
76
73
|
console.log(pc.yellow("\nPlease review the following messages from emitters:"));
|
|
@@ -86,15 +83,16 @@ async function promptCustomParameters(template) {
|
|
|
86
83
|
if (!template.inputs) {
|
|
87
84
|
return {};
|
|
88
85
|
}
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
86
|
+
const results = {};
|
|
87
|
+
for (const [name, templateInput] of Object.entries(template.inputs)) {
|
|
88
|
+
if (templateInput.type === "text") {
|
|
89
|
+
results[name] = await input({
|
|
90
|
+
message: templateInput.description,
|
|
91
|
+
default: templateInput.initialValue,
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return results;
|
|
98
96
|
}
|
|
99
97
|
async function isDirectoryEmpty(directory) {
|
|
100
98
|
try {
|
|
@@ -105,22 +103,37 @@ async function isDirectoryEmpty(directory) {
|
|
|
105
103
|
return true;
|
|
106
104
|
}
|
|
107
105
|
}
|
|
106
|
+
function warning(message) {
|
|
107
|
+
// eslint-disable-next-line no-console
|
|
108
|
+
console.log(pc.yellow(`warning: ${message}`));
|
|
109
|
+
}
|
|
110
|
+
function success(message) {
|
|
111
|
+
// eslint-disable-next-line no-console
|
|
112
|
+
console.log(pc.green(`success: ${message}`));
|
|
113
|
+
}
|
|
114
|
+
function whiteline() {
|
|
115
|
+
// eslint-disable-next-line no-console
|
|
116
|
+
console.log("");
|
|
117
|
+
}
|
|
108
118
|
async function confirmDirectoryEmpty(directory) {
|
|
109
119
|
if (await isDirectoryEmpty(directory)) {
|
|
110
120
|
return true;
|
|
111
121
|
}
|
|
112
|
-
|
|
122
|
+
warning(`Folder ${pc.cyan(directory)} is not empty.`);
|
|
123
|
+
whiteline();
|
|
124
|
+
return confirm(`Initialize a new project here?:`);
|
|
113
125
|
}
|
|
114
126
|
async function confirm(message) {
|
|
115
|
-
|
|
116
|
-
name: "confirm",
|
|
117
|
-
type: "confirm",
|
|
127
|
+
return await confirmInquirer({
|
|
118
128
|
message,
|
|
119
|
-
|
|
129
|
+
default: true,
|
|
120
130
|
});
|
|
121
|
-
return confirm;
|
|
122
131
|
}
|
|
123
132
|
async function downloadTemplates(host, url) {
|
|
133
|
+
warning(`Downloading or using an untrusted template may contain malicious packages that can compromise your system and data. Proceed with caution and verify the source.`);
|
|
134
|
+
if (!(await confirm("Continue"))) {
|
|
135
|
+
process.exit(1);
|
|
136
|
+
}
|
|
124
137
|
let file;
|
|
125
138
|
try {
|
|
126
139
|
file = await readUrlOrPath(host, url);
|
|
@@ -149,33 +162,50 @@ async function downloadTemplates(host, url) {
|
|
|
149
162
|
}
|
|
150
163
|
return { templates: json, baseUri: getDirectoryPath(file.path), file };
|
|
151
164
|
}
|
|
165
|
+
function getTemplateName(template) {
|
|
166
|
+
if (isTemplateCompatibleWithTspVersion(template)) {
|
|
167
|
+
return template.title;
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
return `${template.title} ${pc.red(`Requires tsp version ${template.compilerVersion}`)}`;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
152
173
|
async function promptTemplateSelection(templates) {
|
|
153
|
-
const
|
|
154
|
-
|
|
155
|
-
name: "templateName",
|
|
156
|
-
message: "Please select a template",
|
|
174
|
+
const templateName = await select({
|
|
175
|
+
message: "Select a project template:",
|
|
157
176
|
choices: Object.entries(templates).map(([id, template]) => {
|
|
158
177
|
return {
|
|
159
178
|
value: id,
|
|
160
179
|
description: template.description,
|
|
161
|
-
|
|
162
|
-
`\tmin compiler ver: ${template.compilerVersion ? template.compilerVersion : "-not specified-"}`,
|
|
180
|
+
name: getTemplateName(template),
|
|
163
181
|
};
|
|
164
182
|
}),
|
|
183
|
+
theme: {
|
|
184
|
+
style: {
|
|
185
|
+
description: (description) => pc.dim(description),
|
|
186
|
+
},
|
|
187
|
+
},
|
|
165
188
|
});
|
|
189
|
+
if (!templateName) {
|
|
190
|
+
process.exit(1);
|
|
191
|
+
}
|
|
166
192
|
const template = templates[templateName];
|
|
167
193
|
if (!template) {
|
|
168
194
|
throw new Error(`Unexpected error: Cannot find template ${templateName}`);
|
|
169
195
|
}
|
|
170
196
|
return templateName;
|
|
171
197
|
}
|
|
198
|
+
function isTemplateCompatibleWithTspVersion(template) {
|
|
199
|
+
const currentCompilerVersion = MANIFEST.version;
|
|
200
|
+
return (template.compilerVersion === undefined ||
|
|
201
|
+
semver.gte(currentCompilerVersion, template.compilerVersion));
|
|
202
|
+
}
|
|
172
203
|
async function validateTemplate(template, loaded) {
|
|
173
204
|
// After selection, validate the template definition
|
|
174
205
|
const currentCompilerVersion = MANIFEST.version;
|
|
175
206
|
let validationResult;
|
|
176
207
|
// 1. If current version > compilerVersion, proceed with strict validation
|
|
177
|
-
if (template
|
|
178
|
-
semver.gte(currentCompilerVersion, template.compilerVersion)) {
|
|
208
|
+
if (isTemplateCompatibleWithTspVersion(template)) {
|
|
179
209
|
validationResult = validateTemplateDefinitions(template, loaded.file, true);
|
|
180
210
|
// 1.1 If strict validation fails, try relaxed validation
|
|
181
211
|
if (!validationResult.valid) {
|
|
@@ -204,45 +234,35 @@ async function selectEmitters(template) {
|
|
|
204
234
|
if (!template.emitters) {
|
|
205
235
|
return {};
|
|
206
236
|
}
|
|
207
|
-
const
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
};
|
|
213
|
-
});
|
|
214
|
-
const { emitters } = await prompts({
|
|
215
|
-
type: "multiselect",
|
|
216
|
-
name: "emitters",
|
|
217
|
-
message: "Select emitters?",
|
|
218
|
-
choices: promptList,
|
|
219
|
-
});
|
|
220
|
-
const selectedEmitters = [...Object.entries(template.emitters)].filter((_, index) => emitters.includes(index));
|
|
221
|
-
return Object.fromEntries(selectedEmitters);
|
|
222
|
-
}
|
|
223
|
-
async function selectLibraries(template) {
|
|
224
|
-
if (template.libraries === undefined || template.libraries.length === 0) {
|
|
225
|
-
return [];
|
|
226
|
-
}
|
|
227
|
-
const libraryChoices = template.libraries.map((x) => ({
|
|
228
|
-
...normalizeLibrary(x),
|
|
229
|
-
description: "",
|
|
230
|
-
}));
|
|
231
|
-
const { libraries } = await prompts({
|
|
232
|
-
type: "multiselect",
|
|
233
|
-
name: "libraries",
|
|
234
|
-
message: "Update the libraries?",
|
|
235
|
-
choices: libraryChoices.map((x) => {
|
|
237
|
+
const emittersList = Object.entries(template.emitters);
|
|
238
|
+
const maxLabelLength = emittersList.reduce((max, [name, emitter]) => Math.max(max, emitter.label?.length ?? name.length), 0);
|
|
239
|
+
const emitters = await checkbox({
|
|
240
|
+
message: "What emitters do you want to use?:",
|
|
241
|
+
choices: emittersList.map(([name, emitter]) => {
|
|
236
242
|
return {
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
243
|
+
value: name,
|
|
244
|
+
name: emitter.label
|
|
245
|
+
? `${emitter.label.padEnd(maxLabelLength + 3)} ${pc.dim(`[${name}]`)}`
|
|
246
|
+
: name,
|
|
247
|
+
description: emitter.description,
|
|
248
|
+
selected: emitter.selected ?? false,
|
|
241
249
|
};
|
|
242
250
|
}),
|
|
243
|
-
|
|
251
|
+
theme: {
|
|
252
|
+
style: {
|
|
253
|
+
renderSelectedChoices: (choices) => {
|
|
254
|
+
if (choices.length === 0) {
|
|
255
|
+
return "None selected.";
|
|
256
|
+
}
|
|
257
|
+
else {
|
|
258
|
+
return `${choices.map((x) => x.value).join(", ")}`;
|
|
259
|
+
}
|
|
260
|
+
},
|
|
261
|
+
},
|
|
262
|
+
},
|
|
244
263
|
});
|
|
245
|
-
|
|
264
|
+
const selectedEmitters = [...Object.entries(template.emitters)].filter(([key, value], index) => emitters.includes(key));
|
|
265
|
+
return Object.fromEntries(selectedEmitters);
|
|
246
266
|
}
|
|
247
267
|
/**
|
|
248
268
|
* Error thrown when init template acquisition fails or template is invalid.
|
|
@@ -262,4 +282,53 @@ function logDiagnostics(diagnostics) {
|
|
|
262
282
|
console.log(diagnostic.message);
|
|
263
283
|
});
|
|
264
284
|
}
|
|
285
|
+
async function action(message, fn) {
|
|
286
|
+
const isTTY = process.stdout?.isTTY && !process.env.CI;
|
|
287
|
+
let interval;
|
|
288
|
+
if (isTTY) {
|
|
289
|
+
const spinner = createSpinner();
|
|
290
|
+
interval = setInterval(() => {
|
|
291
|
+
process.stdout.clearLine(0);
|
|
292
|
+
process.stdout.cursorTo(0);
|
|
293
|
+
process.stdout.write(`\r ${pc.yellow(spinner())} ${message}`);
|
|
294
|
+
}, 300);
|
|
295
|
+
}
|
|
296
|
+
else {
|
|
297
|
+
// eslint-disable-next-line no-console
|
|
298
|
+
console.log(` - ${message}`);
|
|
299
|
+
}
|
|
300
|
+
try {
|
|
301
|
+
await fn();
|
|
302
|
+
if (isTTY) {
|
|
303
|
+
process.stdout.clearLine(0);
|
|
304
|
+
process.stdout.cursorTo(0);
|
|
305
|
+
process.stdout.write(`\r ${pc.green("✓")} ${message}\n`);
|
|
306
|
+
}
|
|
307
|
+
else {
|
|
308
|
+
// eslint-disable-next-line no-console
|
|
309
|
+
console.log(` ${pc.green("✓")} ${message}`);
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
catch (e) {
|
|
313
|
+
// eslint-disable-next-line no-console
|
|
314
|
+
console.log(`\r ${pc.red("×")} ${message}\n${e.message}`);
|
|
315
|
+
process.exit(1);
|
|
316
|
+
}
|
|
317
|
+
finally {
|
|
318
|
+
if (interval) {
|
|
319
|
+
clearInterval(interval);
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
import isUnicodeSupported from "is-unicode-supported";
|
|
324
|
+
export const spinnerFrames = isUnicodeSupported()
|
|
325
|
+
? ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
|
|
326
|
+
: ["-", "\\", "|", "/"];
|
|
327
|
+
export function createSpinner() {
|
|
328
|
+
let index = 0;
|
|
329
|
+
return () => {
|
|
330
|
+
index = ++index % spinnerFrames.length;
|
|
331
|
+
return spinnerFrames[index];
|
|
332
|
+
};
|
|
333
|
+
}
|
|
265
334
|
//# sourceMappingURL=init.js.map
|