@forge/manifest 7.2.0-next.1 → 7.2.0-next.2

package/out/validators/storage-validator.js

@@ -4,12 +4,15 @@ exports.StorageValidator = void 0;
 const text_1 = require("../text");
 const utils_1 = require("../utils");
 class StorageValidator {
-    entityAttributeMaxLength = 30;
-    entityAttributesMaxCount = 50;
-    entityIndexesMaxCount = 7;
-    reservedIndexName = 'by-key';
+    constructor() {
+        this.entityAttributeMaxLength = 30;
+        this.entityAttributesMaxCount = 50;
+        this.entityIndexesMaxCount = 7;
+        this.reservedIndexName = 'by-key';
+    }
     async validate(manifest) {
-        if (!manifest?.typedContent?.app?.storage) {
+        var _a, _b;
+        if (!((_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest.typedContent) === null || _a === void 0 ? void 0 : _a.app) === null || _b === void 0 ? void 0 : _b.storage)) {
             return {
                 success: true,
                 manifestObject: manifest
@@ -26,32 +29,17 @@ class StorageValidator {
         entities.forEach((entity) => {
             const { name, attributes } = entity;
             if (Object.keys(attributes).length > this.entityAttributesMaxCount) {
-                validationErrors.push({
-                    message: text_1.errors.app.storage.entities.tooManyAttributes(name, this.entityAttributesMaxCount),
-                    reference: text_1.References.App,
-                    level: 'error',
-                    ...(0, utils_1.findPosition)('entities', manifest.yamlContentByLine)
-                });
+                validationErrors.push(Object.assign({ message: text_1.errors.app.storage.entities.tooManyAttributes(name, this.entityAttributesMaxCount), reference: text_1.References.App, level: 'error' }, (0, utils_1.findPosition)('entities', manifest.yamlContentByLine)));
             }
             Object.keys(attributes).forEach((attributeKey) => {
                 if (attributeKey.length > this.entityAttributeMaxLength) {
-                    validationErrors.push({
-                        message: text_1.errors.app.storage.entities.attributeNameTooLong(name, attributeKey, this.entityAttributeMaxLength),
-                        reference: text_1.References.App,
-                        level: 'error',
-                        ...(0, utils_1.findPosition)('entities', manifest.yamlContentByLine)
-                    });
+                    validationErrors.push(Object.assign({ message: text_1.errors.app.storage.entities.attributeNameTooLong(name, attributeKey, this.entityAttributeMaxLength), reference: text_1.References.App, level: 'error' }, (0, utils_1.findPosition)('entities', manifest.yamlContentByLine)));
                 }
             });
             if (entity.indexes) {
                 const { indexes } = entity;
                 if (indexes.length > this.entityIndexesMaxCount) {
-                    validationErrors.push({
-                        message: text_1.errors.app.storage.entities.tooManyIndexes(name, this.entityIndexesMaxCount),
-                        reference: text_1.References.App,
-                        level: 'error',
-                        ...(0, utils_1.findPosition)('entities', manifest.yamlContentByLine)
-                    });
+                    validationErrors.push(Object.assign({ message: text_1.errors.app.storage.entities.tooManyIndexes(name, this.entityIndexesMaxCount), reference: text_1.References.App, level: 'error' }, (0, utils_1.findPosition)('entities', manifest.yamlContentByLine)));
                 }
                 const indexName = [];
                 const indexRange = [];
@@ -69,31 +57,16 @@ class StorageValidator {
                     }
                 });
                 if (indexName.find((name) => name === this.reservedIndexName)) {
-                    validationErrors.push({
-                        message: text_1.errors.app.storage.entities.reservedIndexName(name, this.reservedIndexName),
-                        reference: text_1.References.App,
-                        level: 'error',
-                        ...(0, utils_1.findPosition)('entities', manifest.yamlContentByLine)
-                    });
+                    validationErrors.push(Object.assign({ message: text_1.errors.app.storage.entities.reservedIndexName(name, this.reservedIndexName), reference: text_1.References.App, level: 'error' }, (0, utils_1.findPosition)('entities', manifest.yamlContentByLine)));
                 }
                 indexRange.forEach((range) => {
                     if (!Object.keys(attributes).length || !attributes[range]) {
-                        validationErrors.push({
-                            message: text_1.errors.app.storage.entities.invalidIndexRange(name, range),
-                            reference: text_1.References.App,
-                            level: 'error',
-                            ...(0, utils_1.findPosition)('entities', manifest.yamlContentByLine)
-                        });
+                        validationErrors.push(Object.assign({ message: text_1.errors.app.storage.entities.invalidIndexRange(name, range), reference: text_1.References.App, level: 'error' }, (0, utils_1.findPosition)('entities', manifest.yamlContentByLine)));
                     }
                 });
                 indexPartition.forEach((partition) => {
                     if (!Object.keys(attributes).length || !attributes[partition]) {
-                        validationErrors.push({
-                            message: text_1.errors.app.storage.entities.invalidIndexPartition(name, partition),
-                            reference: text_1.References.App,
-                            level: 'error',
-                            ...(0, utils_1.findPosition)('entities', manifest.yamlContentByLine)
-                        });
+                        validationErrors.push(Object.assign({ message: text_1.errors.app.storage.entities.invalidIndexPartition(name, partition), reference: text_1.References.App, level: 'error' }, (0, utils_1.findPosition)('entities', manifest.yamlContentByLine)));
                     }
                 });
             }

package/out/validators/yaml-validator.d.ts

@@ -1,8 +1,6 @@
 import { ManifestObject, ManifestValidationResult } from '../types';
 import { ValidatorInterface } from './validator-interface';
 export declare class YamlValidator<T> implements ValidatorInterface<ManifestObject<T> | undefined, T> {
-    private manifestParser;
-    constructor();
     validate(manifest: ManifestObject<T> | undefined): Promise<ManifestValidationResult<T>>;
 }
 //# sourceMappingURL=yaml-validator.d.ts.map

package/out/validators/yaml-validator.d.ts.map

@@ -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;IAC3F,OAAO,CAAC,cAAc,CAAiB;;IAIjC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;CAiD9F"}
+{"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;AAE3D,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"}

package/out/validators/yaml-validator.js

@@ -2,16 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YamlValidator = void 0;
 const tslib_1 = require("tslib");
-const yaml_1 = require("yaml");
+const yaml_1 = tslib_1.__importStar(require("yaml"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const text_1 = require("../text");
-const __1 = require("..");
 class YamlValidator {
-    manifestParser;
-    constructor() {
-        this.manifestParser = new __1.ManifestParser(process.env);
-    }
     async validate(manifest) {
+        var _a, _b, _c;
         if (!manifest || !manifest.filePath) {
             return {
                 success: false,
@@ -20,7 +16,7 @@ class YamlValidator {
         }
         try {
             const content = fs_1.default.readFileSync(manifest.filePath, 'utf8');
-            const manifestContent = this.manifestParser.parseManifest(content);
+            const manifestContent = yaml_1.default.parse(content);
             return {
                 success: true,
                 manifestObject: {
@@ -32,7 +28,7 @@ class YamlValidator {
         }
         catch (e) {
             if (e instanceof yaml_1.YAMLError) {
-                const pos = e.linePos?.[0];
+                const pos = (_a = e.linePos) === null || _a === void 0 ? void 0 : _a[0];
                 return {
                     success: false,
                     errors: [
@@ -40,8 +36,8 @@ class YamlValidator {
                             message: text_1.errors.invalidManifest(e.message.replace(/(at line).+/gms, '').trim()),
                             reference: text_1.References.InvalidManifest,
                             level: 'error',
-                            line: pos?.line ?? 0,
-                            column: pos?.col ?? 0
+                            line: (_b = pos === null || pos === void 0 ? void 0 : pos.line) !== null && _b !== void 0 ? _b : 0,
+                            column: (_c = pos === null || pos === void 0 ? void 0 : pos.col) !== null && _c !== void 0 ? _c : 0
                         }
                     ]
                 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/manifest",
-  "version": "7.2.0-next.1",
+  "version": "7.2.0-next.2",
   "description": "Definitions and validations of the Forge manifest",
   "main": "out/index.js",
   "scripts": {
@@ -23,7 +23,6 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@forge/util": "1.4.3",
-    "@sentry/node": "7.100.1",
     "ajv": "^8.12.0",
     "ajv-formats": "2.1.1",
     "cheerio": "^0.22.0",

package/out/utils/manifest-parser.d.ts

@@ -1,15 +0,0 @@
-import { ManifestSchema } from '../schema/manifest';
-export declare class ManifestParserError extends Error {
-    constructor(message: string);
-    getAttributes(): {
-        isUserError: boolean;
-    };
-}
-export declare class ManifestParser {
-    private readonly envVarsRecord;
-    constructor(envVarsRecord?: Record<string, string | undefined>);
-    parseManifest: (manifest: string) => ManifestSchema;
-    parseManifestAsString: (manifest: string) => string;
-    private environmentVariableReviver;
-}
-//# sourceMappingURL=manifest-parser.d.ts.map

package/out/utils/manifest-parser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"manifest-parser.d.ts","sourceRoot":"","sources":["../../src/utils/manifest-parser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAKpD,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;IAMpB,aAAa;;;CAKrB;AACD,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAM;IACnF,aAAa,aAAc,MAAM,oBAAwE;IAEzG,qBAAqB,aAAc,MAAM,YAAgE;IAEzG,OAAO,CAAC,0BAA0B,CAgBhC;CACH"}

package/out/utils/manifest-parser.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ManifestParser = exports.ManifestParserError = void 0;
-const tslib_1 = require("tslib");
-const yaml_1 = require("yaml");
-const errors_1 = require("../text/errors");
-const Sentry = tslib_1.__importStar(require("@sentry/node"));
-const yamlConfigOptions = { indent: 2, skipInvalid: true };
-class ManifestParserError extends Error {
-    constructor(message) {
-        super(message);
-    }
-    getAttributes() {
-        return {
-            isUserError: true
-        };
-    }
-}
-exports.ManifestParserError = ManifestParserError;
-class ManifestParser {
-    envVarsRecord;
-    constructor(envVarsRecord = {}) {
-        this.envVarsRecord = envVarsRecord;
-    }
-    parseManifest = (manifest) => (0, yaml_1.parse)(manifest, this.environmentVariableReviver);
-    parseManifestAsString = (manifest) => (0, yaml_1.stringify)(this.parseManifest(manifest), yamlConfigOptions);
-    environmentVariableReviver = (_, value) => {
-        if (!(typeof value == 'string')) {
-            return value;
-        }
-        value = value.replaceAll(/\$\{([a-zA-Z_][a-zA-Z0-9_]*)\}/g, (_, envVarName) => {
-            const envVar = this.envVarsRecord[envVarName];
-            if (envVar === undefined) {
-                throw new ManifestParserError(errors_1.errors.schema.missingEnvironmentVariable(envVarName));
-            }
-            Sentry.captureMessage('replaced environment variable');
-            return envVar;
-        });
-        return value;
-    };
-}
-exports.ManifestParser = ManifestParser;