@forge/manifest 8.6.0-next.0 → 8.6.0-next.2

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/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @forge/manifest
2
2
 
3
+ ## 8.6.0-next.2
4
+
5
+ ### Minor Changes
6
+
7
+ - 793b6cf: Add `appIsLicensed` and `appEdition` display condition to Confluence
8
+
9
+ ## 8.6.0-next.1
10
+
11
+ ### Patch Changes
12
+
13
+ - a6ba0b4: Improved handling of manifest paths in manifest interpolators
14
+
3
15
  ## 8.6.0-next.0
4
16
 
5
17
  ### Minor Changes
@@ -1,4 +1,4 @@
1
- import { InterpolatorType, ManifestInterpolator, ManifestInterpolatorError } from './manifest-interpolator';
1
+ import { InterpolateInput, InterpolatorType, ManifestInterpolator, ManifestInterpolatorError } from './manifest-interpolator';
2
2
  import { ManifestSchema } from '../schema/manifest';
3
3
  export declare class EnvironmentVariableInterpolatorError extends ManifestInterpolatorError {
4
4
  constructor(message: string);
@@ -9,7 +9,7 @@ export declare class EnvironmentVariableInterpolator implements ManifestInterpol
9
9
  POSSIBLE_ENVIRONMENT_VARIABLE: RegExp;
10
10
  private envVarsToReplace;
11
11
  constructor(envVarsRecord?: Record<string, string | undefined>);
12
- interpolate(manifest: ManifestSchema): ManifestSchema;
12
+ interpolate<T>({ manifest }: InterpolateInput<T>): ManifestSchema;
13
13
  private environmentVariableReviver;
14
14
  }
15
15
  //# sourceMappingURL=environment-variable-interpolator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"environment-variable-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/environment-variable-interpolator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC5G,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,qBAAa,oCAAqC,SAAQ,yBAAyB;gBACrE,OAAO,EAAE,MAAM;CAI5B;AAKD,qBAAa,+BAAgC,YAAW,oBAAoB;IAS9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAR1C,IAAI,EAAE,gBAAgB,CAAyC;IAI/D,6BAA6B,SAAqC;IAElE,OAAO,CAAC,gBAAgB,CAAW;gBAEN,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAM;IAInF,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,cAAc;IAKrD,OAAO,CAAC,0BAA0B,CAkBhC;CACH"}
1
+ {"version":3,"file":"environment-variable-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/environment-variable-interpolator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,qBAAa,oCAAqC,SAAQ,yBAAyB;gBACrE,OAAO,EAAE,MAAM;CAI5B;AAKD,qBAAa,+BAAgC,YAAW,oBAAoB;IAS9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAR1C,IAAI,EAAE,gBAAgB,CAAyC;IAI/D,6BAA6B,SAAqC;IAElE,OAAO,CAAC,gBAAgB,CAAW;gBAEN,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAM;IAInF,WAAW,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,cAAc;IAKjE,OAAO,CAAC,0BAA0B,CAkBhC;CACH"}
@@ -22,7 +22,7 @@ class EnvironmentVariableInterpolator {
22
22
  this.envVarsRecord = envVarsRecord;
23
23
  this.envVarsToReplace = [];
24
24
  }
25
- interpolate(manifest) {
25
+ interpolate({ manifest }) {
26
26
  this.envVarsToReplace = manifest.environment?.variables ?? [];
27
27
  return (0, yaml_1.parse)(JSON.stringify(manifest), this.environmentVariableReviver);
28
28
  }
@@ -1,9 +1,13 @@
1
1
  import { ManifestSchema } from '../schema/manifest';
2
2
  import { ManifestInterpolator } from './manifest-interpolator';
3
+ export declare type ManifestInterpolatorInput<T> = {
4
+ content: string;
5
+ filePath: string;
6
+ };
3
7
  export declare class ManifestInterpolatorManager {
4
8
  private interpolators;
5
9
  constructor();
6
10
  addInterpolator(interpolator: ManifestInterpolator): void;
7
- interpolate(manifest: string): ManifestSchema;
11
+ interpolate<T>({ content, filePath }: ManifestInterpolatorInput<T>): ManifestSchema;
8
12
  }
9
13
  //# sourceMappingURL=manifest-interpolator-manager.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"manifest-interpolator-manager.d.ts","sourceRoot":"","sources":["../../src/interpolator/manifest-interpolator-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAoB,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAMjF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,aAAa,CAA8C;;IAUnE,eAAe,CAAC,YAAY,EAAE,oBAAoB,GAAG,IAAI;IASzD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc;CAO9C"}
1
+ {"version":3,"file":"manifest-interpolator-manager.d.ts","sourceRoot":"","sources":["../../src/interpolator/manifest-interpolator-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAoB,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAEjF,oBAAY,yBAAyB,CAAC,CAAC,IAAI;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAMF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,aAAa,CAA8C;;IAUnE,eAAe,CAAC,YAAY,EAAE,oBAAoB,GAAG,IAAI;IASzD,WAAW,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC,GAAG,cAAc;CAOpF"}
@@ -10,10 +10,10 @@ class ManifestInterpolatorManager {
10
10
  addInterpolator(interpolator) {
11
11
  this.interpolators.set(interpolator.type, interpolator);
12
12
  }
13
- interpolate(manifest) {
14
- let interpolatedManifest = (0, yaml_1.parse)(manifest);
13
+ interpolate({ content, filePath }) {
14
+ let interpolatedManifest = (0, yaml_1.parse)(content);
15
15
  for (const interpolator of this.interpolators.values()) {
16
- interpolatedManifest = interpolator.interpolate(interpolatedManifest);
16
+ interpolatedManifest = interpolator.interpolate({ manifest: interpolatedManifest, filePath });
17
17
  }
18
18
  return interpolatedManifest;
19
19
  }
@@ -6,8 +6,12 @@ export declare enum InterpolatorType {
6
6
  STRING_RESOURCE = 0,
7
7
  ENVIRONMENT_VARIABLE = 1
8
8
  }
9
+ export declare type InterpolateInput<T> = {
10
+ manifest: ManifestSchema;
11
+ filePath: string;
12
+ };
9
13
  export interface ManifestInterpolator {
10
14
  type: InterpolatorType;
11
- interpolate(manifest: ManifestSchema): ManifestSchema;
15
+ interpolate<T>(input: InterpolateInput<T>): ManifestSchema;
12
16
  }
13
17
  //# sourceMappingURL=manifest-interpolator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"manifest-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/manifest-interpolator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,OAAO,EAAE,MAAM;CAI5B;AAED,oBAAY,gBAAgB;IAC1B,eAAe,IAAA;IACf,oBAAoB,IAAA;CACrB;AAKD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,gBAAgB,CAAC;IAMvB,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,cAAc,CAAC;CACvD"}
1
+ {"version":3,"file":"manifest-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/manifest-interpolator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,OAAO,EAAE,MAAM;CAI5B;AAED,oBAAY,gBAAgB;IAC1B,eAAe,IAAA;IACf,oBAAoB,IAAA;CACrB;AAED,oBAAY,gBAAgB,CAAC,CAAC,IAAI;IAChC,QAAQ,EAAE,cAAc,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAKF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,gBAAgB,CAAC;IAMvB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC;CAC5D"}
@@ -1,11 +1,11 @@
1
1
  import { ManifestSchema } from '../schema/manifest';
2
- import { InterpolatorType, ManifestInterpolator, ManifestInterpolatorError } from './manifest-interpolator';
2
+ import { InterpolateInput, InterpolatorType, ManifestInterpolator, ManifestInterpolatorError } from './manifest-interpolator';
3
3
  export declare class StringResourceInterpolatorError extends ManifestInterpolatorError {
4
4
  constructor(message: string);
5
5
  }
6
6
  export declare class StringResourceInterpolator implements ManifestInterpolator {
7
7
  type: InterpolatorType;
8
- interpolate(manifest: ManifestSchema): ManifestSchema;
8
+ interpolate<T>({ manifest, filePath }: InterpolateInput<T>): ManifestSchema;
9
9
  private fetchContentFromResourceFile;
10
10
  private getResourcePath;
11
11
  private checkIfResourceIsValid;
@@ -1 +1 @@
1
- {"version":3,"file":"string-resource-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/string-resource-interpolator.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG3E,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAa5G,qBAAa,+BAAgC,SAAQ,yBAAyB;gBAChE,OAAO,EAAE,MAAM;CAI5B;AAKD,qBAAa,0BAA2B,YAAW,oBAAoB;IACrE,IAAI,EAAE,gBAAgB,CAAoC;IAE1D,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,cAAc;IAiBrD,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,8BAA8B;CAOvC"}
1
+ {"version":3,"file":"string-resource-interpolator.d.ts","sourceRoot":"","sources":["../../src/interpolator/string-resource-interpolator.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG3E,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AAajC,qBAAa,+BAAgC,SAAQ,yBAAyB;gBAChE,OAAO,EAAE,MAAM;CAI5B;AAKD,qBAAa,0BAA2B,YAAW,oBAAoB;IACrE,IAAI,EAAE,gBAAgB,CAAoC;IAE1D,WAAW,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,cAAc;IAiB3E,OAAO,CAAC,4BAA4B;IAcpC,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,8BAA8B;CAOvC"}
@@ -19,7 +19,7 @@ class StringResourceInterpolatorError extends manifest_interpolator_1.ManifestIn
19
19
  exports.StringResourceInterpolatorError = StringResourceInterpolatorError;
20
20
  class StringResourceInterpolator {
21
21
  type = manifest_interpolator_1.InterpolatorType.STRING_RESOURCE;
22
- interpolate(manifest) {
22
+ interpolate({ manifest, filePath }) {
23
23
  MODULE_PROPERTIES_TO_INTERPOLATE.forEach(({ moduleType, property }) => {
24
24
  const modules = manifest.modules?.[moduleType];
25
25
  modules?.forEach((module) => {
@@ -27,16 +27,16 @@ class StringResourceInterpolator {
27
27
  const moduleAny = module;
28
28
  const propertyValue = moduleAny[property];
29
29
  if (propertyValue.startsWith('resource:')) {
30
- moduleAny[property] = this.fetchContentFromResourceFile(propertyValue, manifest);
30
+ moduleAny[property] = this.fetchContentFromResourceFile(propertyValue, manifest, filePath);
31
31
  }
32
32
  }
33
33
  });
34
34
  });
35
35
  return manifest;
36
36
  }
37
- fetchContentFromResourceFile(modulePropertyWithStringResource, manifest) {
37
+ fetchContentFromResourceFile(modulePropertyWithStringResource, manifest, manifestPath) {
38
38
  const resourcePath = this.getResourcePath(manifest, modulePropertyWithStringResource);
39
- const manifestDir = (0, path_1.dirname)(types_1.MANIFEST_FILE);
39
+ const manifestDir = (0, path_1.dirname)(manifestPath);
40
40
  try {
41
41
  return (0, fs_1.readFileSync)((0, path_1.resolve)(manifestDir, resourcePath), 'utf8');
42
42
  }
@@ -2,6 +2,14 @@
2
2
  "$schema": "http://json-schema.org/draft-07/schema#",
3
3
  "additionalProperties": false,
4
4
  "definitions": {
5
+ "AppEditionType": {
6
+ "enum": [
7
+ "advanced",
8
+ "free",
9
+ "standard"
10
+ ],
11
+ "type": "string"
12
+ },
5
13
  "Confluence": {
6
14
  "anyOf": [
7
15
  {
@@ -10,6 +18,12 @@
10
18
  {
11
19
  "additionalProperties": false,
12
20
  "properties": {
21
+ "appEdition": {
22
+ "$ref": "#/definitions/AppEditionType"
23
+ },
24
+ "appIsLicensed": {
25
+ "type": "boolean"
26
+ },
13
27
  "entityPropertyExists": {
14
28
  "$ref": "#/definitions/EntityPropertyExists_1"
15
29
  },
@@ -37,6 +51,12 @@
37
51
  {
38
52
  "additionalProperties": false,
39
53
  "properties": {
54
+ "appEdition": {
55
+ "$ref": "#/definitions/AppEditionType"
56
+ },
57
+ "appIsLicensed": {
58
+ "type": "boolean"
59
+ },
40
60
  "entityPropertyEqualTo": {
41
61
  "$ref": "#/definitions/EntityPropertyEqualTo_1"
42
62
  },
@@ -64,6 +84,12 @@
64
84
  {
65
85
  "additionalProperties": false,
66
86
  "properties": {
87
+ "appEdition": {
88
+ "$ref": "#/definitions/AppEditionType"
89
+ },
90
+ "appIsLicensed": {
91
+ "type": "boolean"
92
+ },
67
93
  "entityPropertyContainsAny": {
68
94
  "$ref": "#/definitions/EntityPropertyContainsAny_1"
69
95
  },
@@ -91,6 +117,12 @@
91
117
  {
92
118
  "additionalProperties": false,
93
119
  "properties": {
120
+ "appEdition": {
121
+ "$ref": "#/definitions/AppEditionType"
122
+ },
123
+ "appIsLicensed": {
124
+ "type": "boolean"
125
+ },
94
126
  "entityPropertyContainsAll": {
95
127
  "$ref": "#/definitions/EntityPropertyContainsAll_1"
96
128
  },
@@ -126,6 +158,12 @@
126
158
  "ConfluenceSpecificProperties": {
127
159
  "additionalProperties": false,
128
160
  "properties": {
161
+ "appEdition": {
162
+ "$ref": "#/definitions/AppEditionType"
163
+ },
164
+ "appIsLicensed": {
165
+ "type": "boolean"
166
+ },
129
167
  "hasAppAccess": {
130
168
  "type": "boolean"
131
169
  },
@@ -326,6 +364,9 @@
326
364
  "IssueView_1": {
327
365
  "additionalProperties": false,
328
366
  "properties": {
367
+ "appEdition": {
368
+ "$ref": "#/definitions/AppEditionType"
369
+ },
329
370
  "appIsLicensed": {
330
371
  "type": "boolean"
331
372
  },
@@ -512,6 +553,9 @@
512
553
  "Jira_1": {
513
554
  "additionalProperties": false,
514
555
  "properties": {
556
+ "appEdition": {
557
+ "$ref": "#/definitions/AppEditionType"
558
+ },
515
559
  "appIsLicensed": {
516
560
  "type": "boolean"
517
561
  },
@@ -572,6 +616,9 @@
572
616
  "ProjectView_1": {
573
617
  "additionalProperties": false,
574
618
  "properties": {
619
+ "appEdition": {
620
+ "$ref": "#/definitions/AppEditionType"
621
+ },
575
622
  "appIsLicensed": {
576
623
  "type": "boolean"
577
624
  },
@@ -3,13 +3,14 @@ declare type Product = {
3
3
  isLoggedIn?: boolean;
4
4
  isSiteAdmin?: boolean;
5
5
  hasAppAccess?: boolean;
6
+ appIsLicensed?: boolean;
7
+ appEdition?: AppEditionType;
6
8
  };
7
9
  declare type Jira = Product & TimeTrackingProviderProperties & EntityPropertyConditionsProperties & {
8
10
  hasSoftwareAccess?: boolean;
9
11
  hasServiceDeskAccess?: boolean;
10
12
  hasServiceManagementAccess?: boolean;
11
13
  hasCoreAccess?: boolean;
12
- appIsLicensed?: boolean;
13
14
  hasGlobalPermission?: string;
14
15
  jiraExpression?: string;
15
16
  };
@@ -112,6 +113,11 @@ interface EntityPropertyContainsAllItem {
112
113
  entityPropertyContainsAll: EntityPropertyContainsAll;
113
114
  }
114
115
  declare type EntityPropertyCondition = EntityPropertyExistsItem | EntityPropertyEqualToItem | EntityPropertyContainsAnyItem | EntityPropertyContainsAllItem;
116
+ declare enum AppEditionType {
117
+ Free = "free",
118
+ Standard = "standard",
119
+ Advanced = "advanced"
120
+ }
115
121
  declare type ConfluenceSpecificProperties = Product & {
116
122
  isSpaceAdmin?: boolean;
117
123
  };
@@ -1 +1 @@
1
- {"version":3,"file":"display-condition-types.d.ts","sourceRoot":"","sources":["../../src/types/display-condition-types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"display-condition-types.d.ts","sourceRoot":"","sources":["../../src/types/display-condition-types.ts"],"names":[],"mappings":"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"}
@@ -10,3 +10,9 @@ var EntityType;
10
10
  EntityType["App"] = "app";
11
11
  EntityType["User"] = "user";
12
12
  })(EntityType || (EntityType = {}));
13
+ var AppEditionType;
14
+ (function (AppEditionType) {
15
+ AppEditionType["Free"] = "free";
16
+ AppEditionType["Standard"] = "standard";
17
+ AppEditionType["Advanced"] = "advanced";
18
+ })(AppEditionType || (AppEditionType = {}));
@@ -5,10 +5,14 @@ export declare class ManifestParserError extends Error {
5
5
  isUserError: boolean;
6
6
  };
7
7
  }
8
+ export declare type ManifestParserInput<T> = {
9
+ content: string;
10
+ filePath: string;
11
+ };
8
12
  export declare class ManifestParser {
9
13
  private manifestInterpolator;
10
14
  constructor(manifestInterpolator: ManifestInterpolatorManager);
11
- parseManifest(manifest: string): import("../index").ManifestSchema;
12
- parseManifestAsString: (manifest: string) => string;
15
+ parseManifest<T>(input: ManifestParserInput<T>): import("../index").ManifestSchema;
16
+ parseManifestAsString<T>(input: ManifestParserInput<T>): string;
13
17
  }
14
18
  //# sourceMappingURL=manifest-parser.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"manifest-parser.d.ts","sourceRoot":"","sources":["../../src/utils/manifest-parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAK5F,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;IAMpB,aAAa;;;CAKrB;AAKD,qBAAa,cAAc;IACb,OAAO,CAAC,oBAAoB;gBAApB,oBAAoB,EAAE,2BAA2B;IAQrE,aAAa,CAAC,QAAQ,EAAE,MAAM;IAgB9B,qBAAqB,aAAc,MAAM,YAAgE;CAC1G"}
1
+ {"version":3,"file":"manifest-parser.d.ts","sourceRoot":"","sources":["../../src/utils/manifest-parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAK5F,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;IAMpB,aAAa;;;CAKrB;AAED,oBAAY,mBAAmB,CAAC,CAAC,IAAI;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAKF,qBAAa,cAAc;IACb,OAAO,CAAC,oBAAoB;gBAApB,oBAAoB,EAAE,2BAA2B;IAQrE,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAgB9C,qBAAqB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC;CAGvD"}
@@ -20,9 +20,9 @@ class ManifestParser {
20
20
  constructor(manifestInterpolator) {
21
21
  this.manifestInterpolator = manifestInterpolator;
22
22
  }
23
- parseManifest(manifest) {
23
+ parseManifest(input) {
24
24
  try {
25
- return this.manifestInterpolator.interpolate(manifest);
25
+ return this.manifestInterpolator.interpolate(input);
26
26
  }
27
27
  catch (error) {
28
28
  if (error instanceof manifest_interpolator_1.ManifestInterpolatorError) {
@@ -31,6 +31,8 @@ class ManifestParser {
31
31
  throw error;
32
32
  }
33
33
  }
34
- parseManifestAsString = (manifest) => (0, yaml_1.stringify)(this.parseManifest(manifest), yamlConfigOptions);
34
+ parseManifestAsString(input) {
35
+ return (0, yaml_1.stringify)(this.parseManifest(input), yamlConfigOptions);
36
+ }
35
37
  }
36
38
  exports.ManifestParser = ManifestParser;
@@ -1 +1 @@
1
- {"version":3,"file":"yaml-validator.d.ts","sourceRoot":"","sources":["../../src/validators/yaml-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAIpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,qBAAa,aAAa,CAAC,CAAC,CAAE,YAAW,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC;IACrF,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;CAiD9F"}
1
+ {"version":3,"file":"yaml-validator.d.ts","sourceRoot":"","sources":["../../src/validators/yaml-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAIpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,qBAAa,aAAa,CAAC,CAAC,CAAE,YAAW,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC;IACrF,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;CAoD9F"}
@@ -16,7 +16,10 @@ class YamlValidator {
16
16
  }
17
17
  try {
18
18
  const content = fs_1.default.readFileSync(manifest.filePath, 'utf8');
19
- const manifestContent = new utils_1.ManifestParserBuilder().withInterpolators().build().parseManifest(content);
19
+ const manifestContent = new utils_1.ManifestParserBuilder()
20
+ .withInterpolators()
21
+ .build()
22
+ .parseManifest({ content, filePath: manifest.filePath });
20
23
  return {
21
24
  success: true,
22
25
  manifestObject: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/manifest",
3
- "version": "8.6.0-next.0",
3
+ "version": "8.6.0-next.2",
4
4
  "description": "Definitions and validations of the Forge manifest",
5
5
  "main": "out/index.js",
6
6
  "scripts": {