@microsoft/teams-manifest 0.1.4-rc-hotfix.1 → 0.1.4-rc-hotfix.2
Sign up to get free protection for your applications and to get access to all the features.
- package/build/index.d.ts +5 -3
- package/build/index.d.ts.map +1 -1
- package/build/index.js +24 -9
- package/build/index.js.map +1 -1
- package/package.json +3 -2
package/build/index.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ import { TeamsAppManifest } from "./manifest";
|
|
|
2
2
|
import { JSONSchemaType } from "ajv";
|
|
3
3
|
import { DevPreviewSchema } from "./devPreviewManifest";
|
|
4
4
|
import { ManifestCommonProperties } from "./ManifestCommonProperties";
|
|
5
|
+
import { DeclarativeCopilotManifestSchema } from "./declarativeCopilotManifest";
|
|
6
|
+
import { PluginManifestSchema } from "./pluginManifest";
|
|
5
7
|
export * from "./manifest";
|
|
6
8
|
export * as devPreview from "./devPreviewManifest";
|
|
7
9
|
export * from "./pluginManifest";
|
|
@@ -35,8 +37,8 @@ export declare class ManifestUtil {
|
|
|
35
37
|
* @param schema - teams-app-manifest schema
|
|
36
38
|
* @returns An empty array if it passes validation, or an array of error string otherwise.
|
|
37
39
|
*/
|
|
38
|
-
static validateManifestAgainstSchema<T extends Manifest = TeamsAppManifest>(manifest: T, schema: JSONSchemaType<T>): Promise<string[]>;
|
|
39
|
-
static fetchSchema<T extends Manifest = TeamsAppManifest>(manifest: T): Promise<JSONSchemaType<T>>;
|
|
40
|
+
static validateManifestAgainstSchema<T extends Manifest | DeclarativeCopilotManifestSchema | PluginManifestSchema = TeamsAppManifest>(manifest: T, schema: JSONSchemaType<T>): Promise<string[]>;
|
|
41
|
+
static fetchSchema<T extends Manifest | DeclarativeCopilotManifestSchema | PluginManifestSchema = TeamsAppManifest>(manifest: T): Promise<JSONSchemaType<T>>;
|
|
40
42
|
/**
|
|
41
43
|
* Validate manifest against {@link TeamsAppManifest#$schema}.
|
|
42
44
|
*
|
|
@@ -46,7 +48,7 @@ export declare class ManifestUtil {
|
|
|
46
48
|
*
|
|
47
49
|
* @returns An empty array if schema validation passes, or an array of error string otherwise.
|
|
48
50
|
*/
|
|
49
|
-
static validateManifest<T extends Manifest = TeamsAppManifest>(manifest: T): Promise<string[]>;
|
|
51
|
+
static validateManifest<T extends Manifest | DeclarativeCopilotManifestSchema | PluginManifestSchema = TeamsAppManifest>(manifest: T): Promise<string[]>;
|
|
50
52
|
/**
|
|
51
53
|
* Parse the manifest and get properties
|
|
52
54
|
* @param manifest
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,YAAY,CAAC;AAGjE,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,YAAY,CAAC;AAGjE,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAGrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,OAAO,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,UAAU,MAAM,sBAAsB,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,cAAc,8BAA8B,CAAC;AAE7C,MAAM,MAAM,0BAA0B,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAC;AAC1E,MAAM,MAAM,4BAA4B,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAC;AAE5E,MAAM,MAAM,QAAQ,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAE3D,qBAAa,YAAY;IACvB;;;;;;;OAOG;WACU,YAAY,CAAC,CAAC,SAAS,QAAQ,GAAG,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAI1F;;;;;;;OAOG;WACU,WAAW,CAAC,CAAC,SAAS,QAAQ,GAAG,gBAAgB,EAC5D,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,GACV,OAAO,CAAC,IAAI,CAAC;IAIhB;;;;;;OAMG;IACH,MAAM,CAAC,6BAA6B,CAClC,CAAC,SAAS,QAAQ,GAAG,gCAAgC,GAAG,oBAAoB,GAAG,gBAAgB,EAC/F,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;WAyB/C,WAAW,CACtB,CAAC,SAAS,QAAQ,GAAG,gCAAgC,GAAG,oBAAoB,GAAG,gBAAgB,EAC/F,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAmB1C;;;;;;;;OAQG;WACU,gBAAgB,CAC3B,CAAC,SAAS,QAAQ,GAAG,gCAAgC,GAAG,oBAAoB,GAAG,gBAAgB,EAC/F,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAKjC;;;OAGG;IACH,MAAM,CAAC,qBAAqB,CAAC,CAAC,SAAS,QAAQ,GAAG,gBAAgB,EAChE,QAAQ,EAAE,CAAC,GACV,wBAAwB;IAuD3B;;;;OAIG;IACH,MAAM,CAAC,8BAA8B,CAAC,QAAQ,EAAE,gBAAgB,GAAG;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;CAe3F"}
|
package/build/index.js
CHANGED
|
@@ -34,6 +34,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
34
34
|
exports.ManifestUtil = exports.devPreview = void 0;
|
|
35
35
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
36
36
|
const ajv_draft_04_1 = __importDefault(require("ajv-draft-04"));
|
|
37
|
+
const ajv_formats_1 = __importDefault(require("ajv-formats"));
|
|
38
|
+
const _2020_1 = __importDefault(require("ajv/dist/2020"));
|
|
37
39
|
const constants_1 = require("./constants");
|
|
38
40
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
39
41
|
__exportStar(require("./manifest"), exports);
|
|
@@ -71,32 +73,45 @@ class ManifestUtil {
|
|
|
71
73
|
* @returns An empty array if it passes validation, or an array of error string otherwise.
|
|
72
74
|
*/
|
|
73
75
|
static validateManifestAgainstSchema(manifest, schema) {
|
|
74
|
-
var _a;
|
|
75
|
-
|
|
76
|
-
|
|
76
|
+
var _a, _b;
|
|
77
|
+
let validate;
|
|
78
|
+
if ((_a = schema.$schema) === null || _a === void 0 ? void 0 : _a.includes("2020-12")) {
|
|
79
|
+
const ajv = new _2020_1.default({
|
|
80
|
+
//formats: { uri: true, email: true },
|
|
81
|
+
allErrors: true,
|
|
82
|
+
strictTypes: false,
|
|
83
|
+
});
|
|
84
|
+
(0, ajv_formats_1.default)(ajv, ["uri", "email", "regex"]);
|
|
85
|
+
validate = ajv.compile(schema);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
const ajv = new ajv_draft_04_1.default({ formats: { uri: true }, allErrors: true, strictTypes: false });
|
|
89
|
+
validate = ajv.compile(schema);
|
|
90
|
+
}
|
|
77
91
|
const valid = validate(manifest);
|
|
78
92
|
if (!valid && validate.errors) {
|
|
79
|
-
return Promise.resolve((
|
|
93
|
+
return Promise.resolve((_b = validate.errors) === null || _b === void 0 ? void 0 : _b.map((error) => `${error.instancePath} ${error.message || ""}`));
|
|
80
94
|
}
|
|
81
95
|
else {
|
|
82
96
|
return Promise.resolve([]);
|
|
83
97
|
}
|
|
84
98
|
}
|
|
85
99
|
static async fetchSchema(manifest) {
|
|
86
|
-
|
|
87
|
-
|
|
100
|
+
const schemaUrl = manifest.$schema;
|
|
101
|
+
if (!schemaUrl) {
|
|
102
|
+
throw new Error("Manifest does not have a $schema property or schema url is not provided.");
|
|
88
103
|
}
|
|
89
104
|
let result;
|
|
90
105
|
try {
|
|
91
|
-
const res = await (0, node_fetch_1.default)(
|
|
106
|
+
const res = await (0, node_fetch_1.default)(schemaUrl);
|
|
92
107
|
result = (await res.json());
|
|
93
108
|
}
|
|
94
109
|
catch (e) {
|
|
95
110
|
if (e instanceof Error) {
|
|
96
|
-
throw new Error(`Failed to get manifest at url ${
|
|
111
|
+
throw new Error(`Failed to get manifest at url ${schemaUrl} due to: ${e.message}`);
|
|
97
112
|
}
|
|
98
113
|
else {
|
|
99
|
-
throw new Error(`Failed to get manifest at url ${
|
|
114
|
+
throw new Error(`Failed to get manifest at url ${schemaUrl} due to: unknown error`);
|
|
100
115
|
}
|
|
101
116
|
}
|
|
102
117
|
return result;
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGlC,wDAA0B;AAC1B,gEAA+B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teams-manifest",
|
|
3
|
-
"version": "0.1.4-rc-hotfix.
|
|
3
|
+
"version": "0.1.4-rc-hotfix.2",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
"@types/node-fetch": "^2.6.9",
|
|
10
10
|
"ajv": "^8.5.0",
|
|
11
11
|
"ajv-draft-04": "^1.0.0",
|
|
12
|
+
"ajv-formats": "^3.0.1",
|
|
12
13
|
"fs-extra": "^9.1.0",
|
|
13
14
|
"node-fetch": "2.7.0"
|
|
14
15
|
},
|
|
@@ -61,5 +62,5 @@
|
|
|
61
62
|
"npx eslint --cache --fix --quiet"
|
|
62
63
|
]
|
|
63
64
|
},
|
|
64
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "0647b71164b5b313a1349fb91e44d76a6de271b9"
|
|
65
66
|
}
|