@typespec/compiler 0.46.0-dev.36 → 0.46.0-dev.38
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/manifest.js +2 -2
- package/dist/src/core/helpers/type-name-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/type-name-utils.js +8 -3
- package/dist/src/core/helpers/type-name-utils.js.map +1 -1
- package/dist/src/core/schema-validator.d.ts +1 -0
- package/dist/src/core/schema-validator.d.ts.map +1 -1
- package/dist/src/core/schema-validator.js +2 -2
- package/dist/src/core/schema-validator.js.map +1 -1
- package/dist/src/init/init-template.d.ts +3 -1
- package/dist/src/init/init-template.d.ts.map +1 -1
- package/dist/src/init/init-template.js +3 -6
- package/dist/src/init/init-template.js.map +1 -1
- package/dist/src/init/init.d.ts.map +1 -1
- package/dist/src/init/init.js +96 -16
- package/dist/src/init/init.js.map +1 -1
- package/package.json +3 -1
package/dist/manifest.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-name-utils.d.ts","sourceRoot":"","sources":["../../../../src/core/helpers/type-name-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,SAAS,EAGT,IAAI,
|
|
1
|
+
{"version":3,"file":"type-name-utils.d.ts","sourceRoot":"","sources":["../../../../src/core/helpers/type-name-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,SAAS,EAGT,IAAI,EAEJ,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,eAAe;IAC9B,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,OAAO,CAAC;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,CAqCrF;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAO5D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,CAavF"}
|
|
@@ -21,9 +21,7 @@ export function getTypeName(type, options) {
|
|
|
21
21
|
case "EnumMember":
|
|
22
22
|
return `${getEnumName(type.enum, options)}.${getIdentifierName(type.name, options)}`;
|
|
23
23
|
case "Union":
|
|
24
|
-
return type
|
|
25
|
-
? getIdentifierName(type.name, options)
|
|
26
|
-
: [...type.variants.values()].map((x) => getTypeName(x.type, options)).join(" | ");
|
|
24
|
+
return getUnionName(type, options);
|
|
27
25
|
case "UnionVariant":
|
|
28
26
|
return getTypeName(type.type, options);
|
|
29
27
|
case "Tuple":
|
|
@@ -108,6 +106,13 @@ function getModelName(model, options) {
|
|
|
108
106
|
return modelName;
|
|
109
107
|
}
|
|
110
108
|
}
|
|
109
|
+
function getUnionName(type, options) {
|
|
110
|
+
const nsPrefix = getNamespacePrefix(type.namespace, options);
|
|
111
|
+
const typeName = type.name
|
|
112
|
+
? getIdentifierName(type.name, options)
|
|
113
|
+
: [...type.variants.values()].map((x) => getTypeName(x.type, options)).join(" | ");
|
|
114
|
+
return nsPrefix + typeName;
|
|
115
|
+
}
|
|
111
116
|
/**
|
|
112
117
|
* Check if the given namespace is the standard library `TypeSpec` namespace.
|
|
113
118
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-name-utils.js","sourceRoot":"","sources":["../../../../src/core/helpers/type-name-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"type-name-utils.js","sourceRoot":"","sources":["../../../../src/core/helpers/type-name-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { JSONSchemaType, JSONSchemaValidator } from "./types.js";
|
|
2
2
|
export interface JSONSchemaValidatorOptions {
|
|
3
3
|
coerceTypes?: boolean;
|
|
4
|
+
strict?: boolean;
|
|
4
5
|
}
|
|
5
6
|
export declare function createJSONSchemaValidator<T>(schema: JSONSchemaType<T>, options?: JSONSchemaValidatorOptions): JSONSchemaValidator;
|
|
6
7
|
//# sourceMappingURL=schema-validator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../../src/core/schema-validator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,cAAc,EAAE,mBAAmB,EAAwB,MAAM,YAAY,CAAC;AAEnG,MAAM,WAAW,0BAA0B;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../../src/core/schema-validator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,cAAc,EAAE,mBAAmB,EAAwB,MAAM,YAAY,CAAC;AAEnG,MAAM,WAAW,0BAA0B;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,yBAAyB,CAAC,CAAC,EACzC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,OAAO,GAAE,0BAA6C,GACrD,mBAAmB,CAwBrB"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import Ajv from "ajv";
|
|
2
2
|
import { compilerAssert } from "./diagnostics.js";
|
|
3
3
|
import { NoTarget } from "./types.js";
|
|
4
|
-
export function createJSONSchemaValidator(schema, options = {}) {
|
|
4
|
+
export function createJSONSchemaValidator(schema, options = { strict: true }) {
|
|
5
5
|
const ajv = new Ajv({
|
|
6
|
-
strict:
|
|
6
|
+
strict: options.strict,
|
|
7
7
|
coerceTypes: options.coerceTypes,
|
|
8
8
|
});
|
|
9
9
|
return { validate };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-validator.js","sourceRoot":"","sources":["../../../src/core/schema-validator.ts"],"names":[],"mappings":"AAAA,OAAO,GAAoB,MAAM,KAAK,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAmD,QAAQ,EAAc,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-validator.js","sourceRoot":"","sources":["../../../src/core/schema-validator.ts"],"names":[],"mappings":"AAAA,OAAO,GAAoB,MAAM,KAAK,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAmD,QAAQ,EAAc,MAAM,YAAY,CAAC;AAOnG,MAAM,UAAU,yBAAyB,CACvC,MAAyB,EACzB,UAAsC,EAAE,MAAM,EAAE,IAAI,EAAE;IAEtD,MAAM,GAAG,GAAG,IAAK,GAAW,CAAC;QAC3B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,CAAC;IAEpB,SAAS,QAAQ,CAAC,MAAe,EAAE,MAAoC;;QACrE,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/B,cAAc,CACZ,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,EAC1B,6DAA6D,CAC9D,CAAC;QAEF,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,KAAK,IAAI,MAAA,QAAQ,CAAC,MAAM,mCAAI,EAAE,EAAE;YACzC,MAAM,UAAU,GAAG,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACvD,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC9B;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AAEvD,SAAS,oBAAoB,CAC3B,KAAkB,EAClB,MAAoC;IAEpC,MAAM,YAAY,GAAG,CAAC,qBAAqB,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,YAAY,IAAI,GAAG,GAAG,CAAC,CAAC;IAC3F,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAC7D,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAC1C,EAAE;QACD,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACrF,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,cAAc,EAAE,CAAC,CAAC;KACnD;IAED,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,OAAO;QACP,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;KACxE,CAAC;AACJ,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { TypeSpecRawConfig } from "../config/types.js";
|
|
|
3
3
|
export interface InitTemplateFile {
|
|
4
4
|
path: string;
|
|
5
5
|
destination: string;
|
|
6
|
+
skipGeneration: boolean;
|
|
6
7
|
}
|
|
7
8
|
export interface InitTemplateInput {
|
|
8
9
|
description: string;
|
|
@@ -18,6 +19,8 @@ export interface InitTemplate {
|
|
|
18
19
|
* Description for the template.
|
|
19
20
|
*/
|
|
20
21
|
description: string;
|
|
22
|
+
/** Minimum Compiler Support Version */
|
|
23
|
+
compilerVersion: string;
|
|
21
24
|
/**
|
|
22
25
|
* List of libraries to include
|
|
23
26
|
*/
|
|
@@ -41,5 +44,4 @@ export interface InitTemplate {
|
|
|
41
44
|
files?: InitTemplateFile[];
|
|
42
45
|
}
|
|
43
46
|
export declare const InitTemplateSchema: JSONSchemaType<InitTemplate>;
|
|
44
|
-
export declare const InitTemplateDefinitionsSchema: JSONSchemaType<Record<string, InitTemplate>>;
|
|
45
47
|
//# sourceMappingURL=init-template.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-template.d.ts","sourceRoot":"","sources":["../../../src/init/init-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"init-template.d.ts","sourceRoot":"","sources":["../../../src/init/init-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CACzB;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,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IAEpB;;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,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,YAAY,CAuC3D,CAAC"}
|
|
@@ -5,6 +5,7 @@ export const InitTemplateSchema = {
|
|
|
5
5
|
properties: {
|
|
6
6
|
title: { type: "string" },
|
|
7
7
|
description: { type: "string" },
|
|
8
|
+
compilerVersion: { type: "string" },
|
|
8
9
|
libraries: { type: "array", items: { type: "string" } },
|
|
9
10
|
skipCompilerPackage: { type: "boolean", nullable: true },
|
|
10
11
|
config: { nullable: true, ...TypeSpecConfigJsonSchema },
|
|
@@ -30,16 +31,12 @@ export const InitTemplateSchema = {
|
|
|
30
31
|
properties: {
|
|
31
32
|
path: { type: "string" },
|
|
32
33
|
destination: { type: "string" },
|
|
34
|
+
skipGeneration: { type: "boolean" },
|
|
33
35
|
},
|
|
34
36
|
required: ["path", "destination"],
|
|
35
37
|
},
|
|
36
38
|
},
|
|
37
39
|
},
|
|
38
|
-
required: ["title", "description"],
|
|
39
|
-
};
|
|
40
|
-
export const InitTemplateDefinitionsSchema = {
|
|
41
|
-
type: "object",
|
|
42
|
-
additionalProperties: InitTemplateSchema,
|
|
43
|
-
required: [],
|
|
40
|
+
required: ["title", "description", "compilerVersion"],
|
|
44
41
|
};
|
|
45
42
|
//# sourceMappingURL=init-template.js.map
|
|
@@ -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;AAwDtE,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;QACnC,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QACvD,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;iBACpC;gBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;aAClC;SACF;KACF;IACD,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,CAAC;CACtD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/init/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/init/init.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAwB,MAAM,kBAAkB,CAAC;AAGlF,OAAO,EAAE,YAAY,EAAwC,MAAM,oBAAoB,CAAC;AAExF,UAAU,iBAAkB,SAAQ,YAAY;IAC9C;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IAEpB;;;OAGG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEhC;;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;AA6BD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,iBAoDtB;AAwMD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,iBAQrF;AA8ED;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IACvB,WAAW,EAAE,SAAS,UAAU,EAAE;gBAAlC,WAAW,EAAE,SAAS,UAAU,EAAE;CAGtD"}
|
package/dist/src/init/init.js
CHANGED
|
@@ -2,6 +2,7 @@ import { readdir } from "fs/promises";
|
|
|
2
2
|
import jsyaml from "js-yaml";
|
|
3
3
|
import Mustache from "mustache";
|
|
4
4
|
import prompts from "prompts";
|
|
5
|
+
import * as semver from "semver";
|
|
5
6
|
import { TypeSpecConfigFilename } from "../config/config-loader.js";
|
|
6
7
|
import { formatTypeSpec } from "../core/formatter.js";
|
|
7
8
|
import { createDiagnostic } from "../core/messages.js";
|
|
@@ -9,7 +10,8 @@ import { getBaseFileName, getDirectoryPath, joinPaths } from "../core/path-utils
|
|
|
9
10
|
import { createJSONSchemaValidator } from "../core/schema-validator.js";
|
|
10
11
|
import { NoTarget } from "../core/types.js";
|
|
11
12
|
import { readUrlOrPath, resolveRelativeUrlOrPath } from "../core/util.js";
|
|
12
|
-
import {
|
|
13
|
+
import { MANIFEST } from "../manifest.js";
|
|
14
|
+
import { InitTemplateSchema } from "./init-template.js";
|
|
13
15
|
const normalizeVersion = function () {
|
|
14
16
|
return function (text, render) {
|
|
15
17
|
return render(text).replaceAll("-", "_");
|
|
@@ -32,7 +34,19 @@ export async function initTypeSpecProject(host, directory, templatesUrl) {
|
|
|
32
34
|
}
|
|
33
35
|
const folderName = getBaseFileName(directory);
|
|
34
36
|
const url = templatesUrl ? { url: templatesUrl } : undefined;
|
|
35
|
-
|
|
37
|
+
// Download template configuration and prompt user to select a template
|
|
38
|
+
// No validation is done until one has been selected
|
|
39
|
+
const templates = url === undefined ? builtInTemplates : await downloadTemplates(host, url);
|
|
40
|
+
const templateName = await promptTemplateSelection(templates, url);
|
|
41
|
+
// Validate minimum compiler version for non built-in templates
|
|
42
|
+
if (url !== undefined && !(await validateTemplate(templates[templateName], url))) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
const template = templates[templateName];
|
|
46
|
+
if (template.description) {
|
|
47
|
+
// eslint-disable-next-line no-console
|
|
48
|
+
console.log(template.description);
|
|
49
|
+
}
|
|
36
50
|
const { name } = await prompts([
|
|
37
51
|
{
|
|
38
52
|
type: "text",
|
|
@@ -57,6 +71,8 @@ export async function initTypeSpecProject(host, directory, templatesUrl) {
|
|
|
57
71
|
normalizePackageName,
|
|
58
72
|
};
|
|
59
73
|
await scaffoldNewProject(host, scaffoldingConfig);
|
|
74
|
+
// eslint-disable-next-line no-console
|
|
75
|
+
console.log("Project created successfully.");
|
|
60
76
|
}
|
|
61
77
|
async function promptCustomParameters(template) {
|
|
62
78
|
if (!template.inputs) {
|
|
@@ -92,10 +108,12 @@ const builtInTemplates = {
|
|
|
92
108
|
title: "Empty project",
|
|
93
109
|
description: "Create an empty project.",
|
|
94
110
|
libraries: [],
|
|
111
|
+
compilerVersion: MANIFEST.version,
|
|
95
112
|
},
|
|
96
113
|
rest: {
|
|
97
114
|
title: "Generic Rest API",
|
|
98
115
|
description: "Create a project representing a generic Rest API",
|
|
116
|
+
compilerVersion: MANIFEST.version,
|
|
99
117
|
libraries: ["@typespec/rest", "@typespec/openapi3"],
|
|
100
118
|
config: {
|
|
101
119
|
emit: ["@typespec/openapi3"],
|
|
@@ -116,6 +134,7 @@ async function downloadTemplates(host, templatesUrl) {
|
|
|
116
134
|
try {
|
|
117
135
|
file = await readUrlOrPath(host, templatesUrl.url);
|
|
118
136
|
templatesUrl.finalUrl = file.path;
|
|
137
|
+
templatesUrl.file = file;
|
|
119
138
|
}
|
|
120
139
|
catch (e) {
|
|
121
140
|
throw new InitTemplateError([
|
|
@@ -139,27 +158,60 @@ async function downloadTemplates(host, templatesUrl) {
|
|
|
139
158
|
}),
|
|
140
159
|
]);
|
|
141
160
|
}
|
|
142
|
-
validateTemplateDefinitions(json, file);
|
|
143
161
|
return json;
|
|
144
162
|
}
|
|
145
|
-
async function
|
|
146
|
-
const templates = templatesUrl === undefined ? builtInTemplates : await downloadTemplates(host, templatesUrl);
|
|
147
|
-
return promptTemplateSelection(templates);
|
|
148
|
-
}
|
|
149
|
-
async function promptTemplateSelection(templates) {
|
|
163
|
+
async function promptTemplateSelection(templates, templatesUrl) {
|
|
150
164
|
const { templateName } = await prompts({
|
|
151
165
|
type: "select",
|
|
152
166
|
name: "templateName",
|
|
153
167
|
message: "Please select a template",
|
|
154
168
|
choices: Object.entries(templates).map(([id, template]) => {
|
|
155
|
-
return {
|
|
169
|
+
return {
|
|
170
|
+
value: id,
|
|
171
|
+
description: template.description,
|
|
172
|
+
title: template.title +
|
|
173
|
+
`\tmin compiler ver: ${template.compilerVersion ? template.compilerVersion : "-not specified-"}`,
|
|
174
|
+
};
|
|
156
175
|
}),
|
|
157
176
|
});
|
|
158
177
|
const template = templates[templateName];
|
|
159
178
|
if (!template) {
|
|
160
179
|
throw new Error(`Unexpected error: Cannot find template ${templateName}`);
|
|
161
180
|
}
|
|
162
|
-
return
|
|
181
|
+
return templateName;
|
|
182
|
+
}
|
|
183
|
+
async function validateTemplate(template, templatesUrl) {
|
|
184
|
+
// After selection, validate the template definition
|
|
185
|
+
const currentCompilerVersion = MANIFEST.version;
|
|
186
|
+
const validationTarget = templatesUrl.file;
|
|
187
|
+
let validationResult;
|
|
188
|
+
// 1. If current version > compilerVersion, proceed with strict validation
|
|
189
|
+
if (template.compilerVersion && semver.gt(currentCompilerVersion, template.compilerVersion)) {
|
|
190
|
+
validationResult = validateTemplateDefinitions(template, validationTarget, true);
|
|
191
|
+
// 1.1 If strict validation fails, try relaxed validation
|
|
192
|
+
if (!validationResult.valid) {
|
|
193
|
+
validationResult = validateTemplateDefinitions(template, validationTarget, false);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
// 2. if version mis-match or none specified, warn and prompt user to continue or not
|
|
198
|
+
const confirmationMessage = template.compilerVersion
|
|
199
|
+
? `The template you selected is designed for tsp version ${template.compilerVersion}. You are currently using tsp version ${currentCompilerVersion}.`
|
|
200
|
+
: `The template you selected did not specify minimum support compiler version. You are currently using tsp version ${currentCompilerVersion}.`;
|
|
201
|
+
if (await confirm(`${confirmationMessage} The project created may not be correct. Do you want to continue?`)) {
|
|
202
|
+
// 2.1 If user choose to continue, proceed with relaxed validation
|
|
203
|
+
validationResult = validateTemplateDefinitions(template, validationTarget, false);
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
return false;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
// 3. If even relaxed validation fails, still prompt user to continue or not
|
|
210
|
+
if (!validationResult.valid) {
|
|
211
|
+
logDiagnostics(validationResult.diagnostics);
|
|
212
|
+
return await confirm("Template schema failed. The project created may not be correct. Do you want to continue?");
|
|
213
|
+
}
|
|
214
|
+
return true;
|
|
163
215
|
}
|
|
164
216
|
async function selectLibraries(template) {
|
|
165
217
|
if (template.libraries.length === 0) {
|
|
@@ -191,6 +243,10 @@ export async function scaffoldNewProject(host, config) {
|
|
|
191
243
|
console.log("TypeSpec init completed. You can run `tsp install` now to install dependencies.");
|
|
192
244
|
}
|
|
193
245
|
async function writePackageJson(host, config) {
|
|
246
|
+
var _a;
|
|
247
|
+
if (isFileSkipGeneration("package.json", (_a = config.files) !== null && _a !== void 0 ? _a : [])) {
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
194
250
|
const dependencies = {};
|
|
195
251
|
if (!config.skipCompilerPackage) {
|
|
196
252
|
dependencies["@typespec/compiler"] = "latest";
|
|
@@ -208,6 +264,10 @@ async function writePackageJson(host, config) {
|
|
|
208
264
|
return host.writeFile(joinPaths(config.directory, "package.json"), JSON.stringify(packageJson, null, 2));
|
|
209
265
|
}
|
|
210
266
|
async function writeConfig(host, config) {
|
|
267
|
+
var _a;
|
|
268
|
+
if (isFileSkipGeneration(TypeSpecConfigFilename, (_a = config.files) !== null && _a !== void 0 ? _a : [])) {
|
|
269
|
+
return;
|
|
270
|
+
}
|
|
211
271
|
if (!config.config) {
|
|
212
272
|
return;
|
|
213
273
|
}
|
|
@@ -215,6 +275,10 @@ async function writeConfig(host, config) {
|
|
|
215
275
|
return host.writeFile(joinPaths(config.directory, TypeSpecConfigFilename), content);
|
|
216
276
|
}
|
|
217
277
|
async function writeMain(host, config) {
|
|
278
|
+
var _a;
|
|
279
|
+
if (isFileSkipGeneration("main.tsp", (_a = config.files) !== null && _a !== void 0 ? _a : [])) {
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
218
282
|
const dependencies = {};
|
|
219
283
|
for (const library of config.libraries) {
|
|
220
284
|
dependencies[library] = "latest";
|
|
@@ -228,7 +292,9 @@ async function writeFiles(host, config) {
|
|
|
228
292
|
return;
|
|
229
293
|
}
|
|
230
294
|
for (const file of config.files) {
|
|
231
|
-
|
|
295
|
+
if (file.skipGeneration !== true) {
|
|
296
|
+
await writeFile(host, config, file);
|
|
297
|
+
}
|
|
232
298
|
}
|
|
233
299
|
}
|
|
234
300
|
async function writeFile(host, config, file) {
|
|
@@ -251,11 +317,25 @@ export class InitTemplateError extends Error {
|
|
|
251
317
|
this.diagnostics = diagnostics;
|
|
252
318
|
}
|
|
253
319
|
}
|
|
254
|
-
function validateTemplateDefinitions(
|
|
255
|
-
const validator = createJSONSchemaValidator(
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
320
|
+
function validateTemplateDefinitions(template, templateName, strictValidation) {
|
|
321
|
+
const validator = createJSONSchemaValidator(InitTemplateSchema, {
|
|
322
|
+
strict: strictValidation,
|
|
323
|
+
});
|
|
324
|
+
const diagnostics = validator.validate(template, templateName);
|
|
325
|
+
return { valid: diagnostics.length === 0, diagnostics };
|
|
326
|
+
}
|
|
327
|
+
function isFileSkipGeneration(fileName, files) {
|
|
328
|
+
for (const file of files) {
|
|
329
|
+
if (file.path === fileName) {
|
|
330
|
+
return file.skipGeneration;
|
|
331
|
+
}
|
|
259
332
|
}
|
|
333
|
+
return false;
|
|
334
|
+
}
|
|
335
|
+
function logDiagnostics(diagnostics) {
|
|
336
|
+
diagnostics.forEach((diagnostic) => {
|
|
337
|
+
// eslint-disable-next-line no-console
|
|
338
|
+
console.log(diagnostic.message);
|
|
339
|
+
});
|
|
260
340
|
}
|
|
261
341
|
//# sourceMappingURL=init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/init/init.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/init/init.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/compiler",
|
|
3
|
-
"version": "0.46.0-dev.
|
|
3
|
+
"version": "0.46.0-dev.38",
|
|
4
4
|
"description": "TypeSpec Compiler Preview",
|
|
5
5
|
"author": "Microsoft Corporation",
|
|
6
6
|
"license": "MIT",
|
|
@@ -65,6 +65,7 @@
|
|
|
65
65
|
"mustache": "~4.2.0",
|
|
66
66
|
"prettier": "~2.8.7",
|
|
67
67
|
"prompts": "~2.4.1",
|
|
68
|
+
"semver": "^7.3.8",
|
|
68
69
|
"vscode-languageserver": "~8.1.0",
|
|
69
70
|
"vscode-languageserver-textdocument": "~1.0.1",
|
|
70
71
|
"yargs": "~17.7.1",
|
|
@@ -79,6 +80,7 @@
|
|
|
79
80
|
"@types/node": "~18.11.9",
|
|
80
81
|
"@types/prettier": "2.6.0",
|
|
81
82
|
"@types/prompts": "~2.4.3",
|
|
83
|
+
"@types/semver": "^7.3.13",
|
|
82
84
|
"@types/yargs": "~17.0.24",
|
|
83
85
|
"@typespec/eslint-config-typespec": "~0.7.0 || >=0.8.0-dev <0.8.0",
|
|
84
86
|
"@typespec/internal-build-utils": "~0.4.2 || >=0.5.0-dev <0.5.0",
|