@stackbit/sdk 0.3.13-sanity-locale.0 → 0.3.13
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/config/config-errors.d.ts +12 -1
- package/dist/config/config-errors.d.ts.map +1 -1
- package/dist/config/config-errors.js +23 -1
- package/dist/config/config-errors.js.map +1 -1
- package/dist/config/config-loader-static.d.ts +2 -2
- package/dist/config/config-loader-static.d.ts.map +1 -1
- package/dist/config/config-loader-static.js +1 -1
- package/dist/config/config-loader-static.js.map +1 -1
- package/dist/config/config-loader-utils.d.ts +3 -3
- package/dist/config/config-loader-utils.d.ts.map +1 -1
- package/dist/config/config-loader-utils.js +4 -6
- package/dist/config/config-loader-utils.js.map +1 -1
- package/dist/config/config-loader.d.ts +10 -9
- package/dist/config/config-loader.d.ts.map +1 -1
- package/dist/config/config-loader.js +70 -34
- package/dist/config/config-loader.js.map +1 -1
- package/dist/config/config-schema.d.ts +3 -2
- package/dist/config/config-schema.d.ts.map +1 -1
- package/dist/config/config-schema.js +40 -13
- package/dist/config/config-schema.js.map +1 -1
- package/dist/config/config-validator.d.ts +6 -1
- package/dist/config/config-validator.d.ts.map +1 -1
- package/dist/config/config-validator.js +13 -2
- package/dist/config/config-validator.js.map +1 -1
- package/package.json +4 -4
- package/src/config/config-errors.ts +26 -1
- package/src/config/config-loader-static.ts +4 -4
- package/src/config/config-loader-utils.ts +8 -10
- package/src/config/config-loader.ts +97 -40
- package/src/config/config-schema.ts +44 -14
- package/src/config/config-validator.ts +25 -11
|
@@ -8,6 +8,17 @@ export declare class ConfigLoadError extends Error {
|
|
|
8
8
|
originalError?: Error;
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
|
+
export declare class StackbitConfigNotFoundError extends Error {
|
|
12
|
+
name: 'StackbitConfigNotFoundError';
|
|
13
|
+
constructor();
|
|
14
|
+
}
|
|
15
|
+
export declare class ModelLoadError extends Error {
|
|
16
|
+
name: 'ModelLoadError';
|
|
17
|
+
originalError?: Error;
|
|
18
|
+
constructor(message: string, { originalError }?: {
|
|
19
|
+
originalError?: Error;
|
|
20
|
+
});
|
|
21
|
+
}
|
|
11
22
|
export declare class ConfigValidationError extends Error {
|
|
12
23
|
name: 'ConfigValidationError';
|
|
13
24
|
type: string;
|
|
@@ -26,5 +37,5 @@ export declare class ConfigPresetsError extends Error {
|
|
|
26
37
|
name: 'ConfigPresetsError';
|
|
27
38
|
constructor(message: string);
|
|
28
39
|
}
|
|
29
|
-
export declare type ConfigError = ConfigLoadError | ConfigValidationError | ConfigPresetsError;
|
|
40
|
+
export declare type ConfigError = ConfigLoadError | StackbitConfigNotFoundError | ModelLoadError | ConfigValidationError | ConfigPresetsError;
|
|
30
41
|
//# sourceMappingURL=config-errors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-errors.d.ts","sourceRoot":"","sources":["../../src/config/config-errors.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gCAAgC,iFAAiF,CAAC;AAC/H,eAAO,MAAM,6BAA6B,QAA8C,CAAC;AACzF,eAAO,MAAM,yBAAyB,QAAwF,CAAC;AAE/H,qBAAa,eAAgB,SAAQ,KAAK;IACtC,IAAI,EAAE,iBAAiB,CAAC;IACxB,aAAa,CAAC,EAAE,KAAK,CAAC;gBACV,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,GAAE;QAAE,aAAa,CAAC,EAAE,KAAK,CAAA;KAAO;CAUjF;AAED,qBAAa,qBAAsB,SAAQ,KAAK;IAC5C,IAAI,EAAE,uBAAuB,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC/B,aAAa,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,GAAG,CAAC;gBACA,EACR,OAAO,EACP,IAAI,EACJ,SAAS,EACT,aAAa,EACb,KAAK,EACR,EAAE;QACC,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;QAC/B,aAAa,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;QACpC,KAAK,CAAC,EAAE,GAAG,CAAC;KACf;CAUJ;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IACzC,IAAI,EAAE,oBAAoB,CAAC;gBACf,OAAO,EAAE,MAAM;CAI9B;AAED,oBAAY,WAAW,GAAG,eAAe,GAAG,qBAAqB,GAAG,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"config-errors.d.ts","sourceRoot":"","sources":["../../src/config/config-errors.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gCAAgC,iFAAiF,CAAC;AAC/H,eAAO,MAAM,6BAA6B,QAA8C,CAAC;AACzF,eAAO,MAAM,yBAAyB,QAAwF,CAAC;AAE/H,qBAAa,eAAgB,SAAQ,KAAK;IACtC,IAAI,EAAE,iBAAiB,CAAC;IACxB,aAAa,CAAC,EAAE,KAAK,CAAC;gBACV,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,GAAE;QAAE,aAAa,CAAC,EAAE,KAAK,CAAA;KAAO;CAUjF;AAED,qBAAa,2BAA4B,SAAQ,KAAK;IAClD,IAAI,EAAE,6BAA6B,CAAC;;CAOvC;AAED,qBAAa,cAAe,SAAQ,KAAK;IACrC,IAAI,EAAE,gBAAgB,CAAC;IACvB,aAAa,CAAC,EAAE,KAAK,CAAC;gBACV,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,GAAE;QAAE,aAAa,CAAC,EAAE,KAAK,CAAA;KAAO;CAUjF;AAED,qBAAa,qBAAsB,SAAQ,KAAK;IAC5C,IAAI,EAAE,uBAAuB,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC/B,aAAa,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,GAAG,CAAC;gBACA,EACR,OAAO,EACP,IAAI,EACJ,SAAS,EACT,aAAa,EACb,KAAK,EACR,EAAE;QACC,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;QAC/B,aAAa,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;QACpC,KAAK,CAAC,EAAE,GAAG,CAAC;KACf;CAUJ;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IACzC,IAAI,EAAE,oBAAoB,CAAC;gBACf,OAAO,EAAE,MAAM;CAI9B;AAED,oBAAY,WAAW,GAAG,eAAe,GAAG,2BAA2B,GAAG,cAAc,GAAG,qBAAqB,GAAG,kBAAkB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ConfigPresetsError = exports.ConfigValidationError = exports.ConfigLoadError = exports.STACKBIT_CONFIG_NOT_FOUND = exports.REFER_TO_STACKBIT_CONFIG_DOCS = exports.REFER_TO_STACKBIT_REFERENCE_DOCS = void 0;
|
|
3
|
+
exports.ConfigPresetsError = exports.ConfigValidationError = exports.ModelLoadError = exports.StackbitConfigNotFoundError = exports.ConfigLoadError = exports.STACKBIT_CONFIG_NOT_FOUND = exports.REFER_TO_STACKBIT_CONFIG_DOCS = exports.REFER_TO_STACKBIT_REFERENCE_DOCS = void 0;
|
|
4
4
|
exports.REFER_TO_STACKBIT_REFERENCE_DOCS = 'please refer to Stackbit documentation: https://docs.stackbit.com/reference/';
|
|
5
5
|
exports.REFER_TO_STACKBIT_CONFIG_DOCS = exports.REFER_TO_STACKBIT_REFERENCE_DOCS + 'config';
|
|
6
6
|
exports.STACKBIT_CONFIG_NOT_FOUND = `stackbit.yaml or stackbit.config.js was not found, ${exports.REFER_TO_STACKBIT_CONFIG_DOCS}`;
|
|
@@ -17,6 +17,28 @@ class ConfigLoadError extends Error {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
exports.ConfigLoadError = ConfigLoadError;
|
|
20
|
+
class StackbitConfigNotFoundError extends Error {
|
|
21
|
+
constructor() {
|
|
22
|
+
super(exports.STACKBIT_CONFIG_NOT_FOUND);
|
|
23
|
+
this.name = 'StackbitConfigNotFoundError';
|
|
24
|
+
// redefine "message" as enumerable, this helps comparing the received and the expected error.message in Jest's toMatchObject() tests
|
|
25
|
+
Object.defineProperty(this, 'message', { value: exports.STACKBIT_CONFIG_NOT_FOUND, writable: true, enumerable: true, configurable: true });
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
exports.StackbitConfigNotFoundError = StackbitConfigNotFoundError;
|
|
29
|
+
class ModelLoadError extends Error {
|
|
30
|
+
constructor(message, { originalError } = {}) {
|
|
31
|
+
super(message);
|
|
32
|
+
this.name = 'ModelLoadError';
|
|
33
|
+
if (originalError) {
|
|
34
|
+
this.originalError = originalError;
|
|
35
|
+
this.stack = originalError.stack;
|
|
36
|
+
}
|
|
37
|
+
// redefine "message" as enumerable, this helps comparing the received and the expected error.message in Jest's toMatchObject() tests
|
|
38
|
+
Object.defineProperty(this, 'message', { value: message, writable: true, enumerable: true, configurable: true });
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.ModelLoadError = ModelLoadError;
|
|
20
42
|
class ConfigValidationError extends Error {
|
|
21
43
|
constructor({ message, type, fieldPath, normFieldPath, value }) {
|
|
22
44
|
super(message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-errors.js","sourceRoot":"","sources":["../../src/config/config-errors.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG,8EAA8E,CAAC;AAClH,QAAA,6BAA6B,GAAG,wCAAgC,GAAG,QAAQ,CAAC;AAC5E,QAAA,yBAAyB,GAAG,sDAAsD,qCAA6B,EAAE,CAAC;AAE/H,MAAa,eAAgB,SAAQ,KAAK;IAGtC,YAAY,OAAe,EAAE,EAAE,aAAa,KAAgC,EAAE;QAC1E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;QAC9B,IAAI,aAAa,EAAE;YACf,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACnC,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;SACpC;QACD,qIAAqI;QACrI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;CACJ;AAbD,0CAaC;AAED,MAAa,qBAAsB,SAAQ,KAAK;IAM5C,YAAY,EACR,OAAO,EACP,IAAI,EACJ,SAAS,EACT,aAAa,EACb,KAAK,EAOR;QACG,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI,SAAS,CAAC;QAChD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,qIAAqI;QACrI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;CACJ;AA5BD,sDA4BC;AAED,MAAa,kBAAmB,SAAQ,KAAK;IAEzC,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACrC,CAAC;CACJ;AAND,gDAMC"}
|
|
1
|
+
{"version":3,"file":"config-errors.js","sourceRoot":"","sources":["../../src/config/config-errors.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG,8EAA8E,CAAC;AAClH,QAAA,6BAA6B,GAAG,wCAAgC,GAAG,QAAQ,CAAC;AAC5E,QAAA,yBAAyB,GAAG,sDAAsD,qCAA6B,EAAE,CAAC;AAE/H,MAAa,eAAgB,SAAQ,KAAK;IAGtC,YAAY,OAAe,EAAE,EAAE,aAAa,KAAgC,EAAE;QAC1E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;QAC9B,IAAI,aAAa,EAAE;YACf,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACnC,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;SACpC;QACD,qIAAqI;QACrI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;CACJ;AAbD,0CAaC;AAED,MAAa,2BAA4B,SAAQ,KAAK;IAElD;QACI,KAAK,CAAC,iCAAyB,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;QAC1C,qIAAqI;QACrI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,iCAAyB,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACvI,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,cAAe,SAAQ,KAAK;IAGrC,YAAY,OAAe,EAAE,EAAE,aAAa,KAAgC,EAAE;QAC1E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;QAC7B,IAAI,aAAa,EAAE;YACf,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACnC,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;SACpC;QACD,qIAAqI;QACrI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;CACJ;AAbD,wCAaC;AAED,MAAa,qBAAsB,SAAQ,KAAK;IAM5C,YAAY,EACR,OAAO,EACP,IAAI,EACJ,SAAS,EACT,aAAa,EACb,KAAK,EAOR;QACG,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI,SAAS,CAAC;QAChD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,qIAAqI;QACrI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;CACJ;AA5BD,sDA4BC;AAED,MAAa,kBAAmB,SAAQ,KAAK;IAEzC,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACrC,CAAC;CACJ;AAND,gDAMC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfigLoadError } from './config-errors';
|
|
1
|
+
import { ConfigLoadError, StackbitConfigNotFoundError } from './config-errors';
|
|
2
2
|
import { Config } from './config-types';
|
|
3
3
|
export declare type LoadStaticStackbitConfigOptions = {
|
|
4
4
|
dirPath: string;
|
|
@@ -10,7 +10,7 @@ export declare type StaticConfig = Pick<Config, 'stackbitVersion' | 'nodeVersion
|
|
|
10
10
|
};
|
|
11
11
|
export declare type LoadStaticConfigResult = {
|
|
12
12
|
config: StaticConfig | null;
|
|
13
|
-
errors: ConfigLoadError[];
|
|
13
|
+
errors: (ConfigLoadError | StackbitConfigNotFoundError)[];
|
|
14
14
|
};
|
|
15
15
|
export declare function loadStaticConfig({ dirPath, secondaryDirPath, logger }: LoadStaticStackbitConfigOptions): Promise<LoadStaticConfigResult>;
|
|
16
16
|
//# sourceMappingURL=config-loader-static.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader-static.d.ts","sourceRoot":"","sources":["../../src/config/config-loader-static.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"config-loader-static.d.ts","sourceRoot":"","sources":["../../src/config/config-loader-static.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAiC,MAAM,iBAAiB,CAAC;AAE9G,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AA+BxC,oBAAY,+BAA+B,GAAG;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,oBAAY,YAAY,GAAG,IAAI,CAC3B,MAAM,EACJ,iBAAiB,GACjB,aAAa,GACb,SAAS,GACT,YAAY,GACZ,SAAS,GACT,qBAAqB,GACrB,mBAAmB,GACnB,oBAAoB,GACpB,QAAQ,GACR,cAAc,GACd,YAAY,GACZ,SAAS,GACT,UAAU,CACf,GAAG;IACA,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACjC,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,eAAe,GAAG,2BAA2B,CAAC,EAAE,CAAC;CAC7D,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,EAAE,+BAA+B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAsB9I"}
|
|
@@ -43,7 +43,7 @@ async function loadStaticConfig({ dirPath, secondaryDirPath, logger }) {
|
|
|
43
43
|
if (!configFilePath) {
|
|
44
44
|
return {
|
|
45
45
|
config: null,
|
|
46
|
-
errors: [new config_errors_1.
|
|
46
|
+
errors: [new config_errors_1.StackbitConfigNotFoundError()]
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
49
|
logger === null || logger === void 0 ? void 0 : logger.debug(`[config-loader-static] found stackbit config at ${configFilePath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader-static.js","sourceRoot":"","sources":["../../src/config/config-loader-static.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,wDAA2B;AAC3B,oDAAuB;AAEvB,2CAA4C;AAG5C,
|
|
1
|
+
{"version":3,"file":"config-loader-static.js","sourceRoot":"","sources":["../../src/config/config-loader-static.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { StackbitConfig as RawConfig } from '@stackbit/types';
|
|
2
|
-
import { ConfigLoadError, ConfigValidationError } from './config-errors';
|
|
2
|
+
import { ConfigLoadError, ModelLoadError, ConfigValidationError, StackbitConfigNotFoundError } from './config-errors';
|
|
3
3
|
import { Config, Model } from './config-types';
|
|
4
4
|
export declare const STACKBIT_CONFIG_YAML_FILES: string[];
|
|
5
5
|
export declare const STACKBIT_CONFIG_JS_FILES: string[];
|
|
@@ -14,7 +14,7 @@ export declare type LoadRawConfigResult = {
|
|
|
14
14
|
error: null;
|
|
15
15
|
} | {
|
|
16
16
|
config: null;
|
|
17
|
-
error: ConfigLoadError;
|
|
17
|
+
error: ConfigLoadError | StackbitConfigNotFoundError;
|
|
18
18
|
};
|
|
19
19
|
export declare type StopConfigWatch = {
|
|
20
20
|
stop?: () => void;
|
|
@@ -30,7 +30,7 @@ export declare function convertToYamlConfig({ config }: {
|
|
|
30
30
|
}): RawConfig;
|
|
31
31
|
export declare function loadYamlModelsFromFiles(config: Config): Promise<{
|
|
32
32
|
models: Model[];
|
|
33
|
-
errors:
|
|
33
|
+
errors: ModelLoadError[];
|
|
34
34
|
}>;
|
|
35
35
|
export declare function getYamlModelDirs(config: Config): string[];
|
|
36
36
|
export declare function mergeConfigModelsWithModelsFromFiles(configModels: Model[], modelsFromFiles: Model[]): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader-utils.d.ts","sourceRoot":"","sources":["../../src/config/config-loader-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,IAAI,SAAS,EAAyF,MAAM,iBAAiB,CAAC;AAErJ,OAAO,EAAE,eAAe,EAAE,qBAAqB,
|
|
1
|
+
{"version":3,"file":"config-loader-utils.d.ts","sourceRoot":"","sources":["../../src/config/config-loader-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,IAAI,SAAS,EAAyF,MAAM,iBAAiB,CAAC;AAErJ,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,2BAA2B,EAAiC,MAAM,iBAAiB,CAAC;AACrJ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAsC,MAAM,gBAAgB,CAAC;AAGnF,eAAO,MAAM,0BAA0B,UAAoC,CAAC;AAC5E,eAAO,MAAM,wBAAwB,UAA6F,CAAC;AACnI,eAAO,MAAM,qBAAqB,UAA+D,CAAC;AAClG,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAE/C,oBAAY,kBAAkB,GAAG,SAAS,GAAG;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,oBAAY,mBAAmB,GACzB;IACI,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,IAAI,CAAC;CACf,GACD;IACI,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,eAAe,GAAG,2BAA2B,CAAC;CACxD,CAAC;AAER,oBAAY,eAAe,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,CAAC;AAEF,oBAAY,2BAA2B,GAAG,mBAAmB,GAAG,eAAe,CAAC;AAEhF,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAS3F;AAED,wBAAsB,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAcvG;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAUnF;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,WAGlD;AAED,wBAAgB,mBAAmB,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAsC7E;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,MAAM,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC,CAoDpH;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAMzD;AAcD,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,MAAM,EAAE,qBAAqB,EAAE,CAAA;CAAE,CAoC1J"}
|
|
@@ -20,7 +20,7 @@ async function loadStackbitYamlFromDir(dirPath) {
|
|
|
20
20
|
if (!stackbitYamlPath) {
|
|
21
21
|
return {
|
|
22
22
|
config: null,
|
|
23
|
-
error: new config_errors_1.
|
|
23
|
+
error: new config_errors_1.StackbitConfigNotFoundError()
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
return await loadConfigFromStackbitYaml(stackbitYamlPath);
|
|
@@ -115,14 +115,14 @@ async function loadYamlModelsFromFiles(config) {
|
|
|
115
115
|
catch (error) {
|
|
116
116
|
return {
|
|
117
117
|
modelMap: result.modelMap,
|
|
118
|
-
errors: result.errors.concat(new config_errors_1.
|
|
118
|
+
errors: result.errors.concat(new config_errors_1.ModelLoadError(`error parsing model, file: ${modelFile}`))
|
|
119
119
|
};
|
|
120
120
|
}
|
|
121
121
|
const modelName = model === null || model === void 0 ? void 0 : model.name;
|
|
122
122
|
if (!modelName) {
|
|
123
123
|
return {
|
|
124
124
|
modelMap: result.modelMap,
|
|
125
|
-
errors: result.errors.concat(new config_errors_1.
|
|
125
|
+
errors: result.errors.concat(new config_errors_1.ModelLoadError(`model does not have a name, file: ${modelFile}`))
|
|
126
126
|
};
|
|
127
127
|
}
|
|
128
128
|
result.modelMap[modelName] = {
|
|
@@ -144,9 +144,7 @@ function getYamlModelDirs(config) {
|
|
|
144
144
|
const sourceType = lodash_1.default.get(modelsSource, 'type', 'files');
|
|
145
145
|
const defaultModelDirs = ['node_modules/@stackbit/components/models', '.stackbit/models'];
|
|
146
146
|
const modelDirs = lodash_1.default.get(modelsSource, 'modelDirs', defaultModelDirs);
|
|
147
|
-
return sourceType === 'files'
|
|
148
|
-
? lodash_1.default.castArray(modelDirs).map((modelDir) => lodash_1.default.trim(modelDir, '/'))
|
|
149
|
-
: defaultModelDirs;
|
|
147
|
+
return sourceType === 'files' ? lodash_1.default.castArray(modelDirs).map((modelDir) => lodash_1.default.trim(modelDir, '/')) : defaultModelDirs;
|
|
150
148
|
}
|
|
151
149
|
exports.getYamlModelDirs = getYamlModelDirs;
|
|
152
150
|
async function readYamlModelFilesFromDir(modelsDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader-utils.js","sourceRoot":"","sources":["../../src/config/config-loader-utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,wDAA2B;AAC3B,sDAA2B;AAC3B,oDAAuB;AAEvB,2CAAqG;AAGrG,
|
|
1
|
+
{"version":3,"file":"config-loader-utils.js","sourceRoot":"","sources":["../../src/config/config-loader-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ModelsSource } from '@stackbit/types';
|
|
1
|
+
import { ModelsSource, ModelExtension } from '@stackbit/types';
|
|
2
2
|
import { ConfigValidationResult } from './config-validator';
|
|
3
|
-
import { ConfigError, ConfigLoadError, ConfigValidationError } from './config-errors';
|
|
3
|
+
import { ConfigError, ConfigLoadError, ModelLoadError, ConfigValidationError, StackbitConfigNotFoundError } from './config-errors';
|
|
4
4
|
import { Logger } from '../utils';
|
|
5
5
|
import type { Config, Model } from './config-types';
|
|
6
6
|
import { StopConfigWatch, RawConfigWithPaths } from './config-loader-utils';
|
|
@@ -18,7 +18,7 @@ export declare function loadConfigWithModelsPresetsAndValidate({ dirPath, models
|
|
|
18
18
|
}): Promise<ConfigWithModelsPresetsResult & StopConfigWatch>;
|
|
19
19
|
export declare type ConfigWithModelsResult = {
|
|
20
20
|
config: Config | null;
|
|
21
|
-
errors: (ConfigLoadError | ConfigValidationError)[];
|
|
21
|
+
errors: (ConfigLoadError | StackbitConfigNotFoundError | ModelLoadError | ConfigValidationError)[];
|
|
22
22
|
};
|
|
23
23
|
export declare function loadConfigWithModels({ dirPath, stackbitConfigESBuildOutDir, watchCallback, logger }: {
|
|
24
24
|
dirPath: string;
|
|
@@ -28,10 +28,10 @@ export declare function loadConfigWithModels({ dirPath, stackbitConfigESBuildOut
|
|
|
28
28
|
}): Promise<ConfigWithModelsResult & StopConfigWatch>;
|
|
29
29
|
export declare type LoadConfigResult = {
|
|
30
30
|
config: Config;
|
|
31
|
-
errors:
|
|
31
|
+
errors: ConfigValidationError[];
|
|
32
32
|
} | {
|
|
33
33
|
config: null;
|
|
34
|
-
errors: ConfigLoadError[];
|
|
34
|
+
errors: (ConfigLoadError | StackbitConfigNotFoundError)[];
|
|
35
35
|
};
|
|
36
36
|
export declare function loadConfig({ dirPath, stackbitConfigESBuildOutDir, watchCallback, logger }: {
|
|
37
37
|
dirPath: string;
|
|
@@ -41,7 +41,7 @@ export declare function loadConfig({ dirPath, stackbitConfigESBuildOutDir, watch
|
|
|
41
41
|
}): Promise<LoadConfigResult & StopConfigWatch>;
|
|
42
42
|
export declare function loadAndMergeModelsFromFiles(config: Config): Promise<{
|
|
43
43
|
config: Config;
|
|
44
|
-
errors: (
|
|
44
|
+
errors: (ModelLoadError | ConfigValidationError)[];
|
|
45
45
|
}>;
|
|
46
46
|
export declare function validateAndNormalizeConfig(config: Config): ConfigValidationResult;
|
|
47
47
|
export declare type RawConfigLoaderResult = {
|
|
@@ -49,7 +49,7 @@ export declare type RawConfigLoaderResult = {
|
|
|
49
49
|
error: null;
|
|
50
50
|
} | {
|
|
51
51
|
config: null;
|
|
52
|
-
error: ConfigLoadError;
|
|
52
|
+
error: ConfigLoadError | StackbitConfigNotFoundError;
|
|
53
53
|
};
|
|
54
54
|
export declare function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCallback, logger }: {
|
|
55
55
|
dirPath: string;
|
|
@@ -57,8 +57,9 @@ export declare function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir
|
|
|
57
57
|
watchCallback?: (result: RawConfigLoaderResult) => void;
|
|
58
58
|
logger?: Logger;
|
|
59
59
|
}): Promise<RawConfigLoaderResult & StopConfigWatch>;
|
|
60
|
-
export declare function mergeConfigModelsWithExternalModels({ configModels, externalModels }: {
|
|
61
|
-
configModels:
|
|
60
|
+
export declare function mergeConfigModelsWithExternalModels({ configModels, externalModels, logger }: {
|
|
61
|
+
configModels: ModelExtension[];
|
|
62
62
|
externalModels: Model[];
|
|
63
|
+
logger?: Logger;
|
|
63
64
|
}): Model[];
|
|
64
65
|
//# sourceMappingURL=config-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/config/config-loader.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAS,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/config/config-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,13 +41,13 @@ async function loadConfigWithModelsPresetsAndValidate({ dirPath, modelsSource, s
|
|
|
41
41
|
stackbitConfigESBuildOutDir,
|
|
42
42
|
watchCallback: watchCallback
|
|
43
43
|
? async (configResult) => {
|
|
44
|
-
const configLoaderResult = await processConfigLoaderResult({ configResult, dirPath, modelsSource });
|
|
44
|
+
const configLoaderResult = await processConfigLoaderResult({ configResult, dirPath, modelsSource, logger });
|
|
45
45
|
watchCallback(configLoaderResult);
|
|
46
46
|
}
|
|
47
47
|
: undefined,
|
|
48
48
|
logger
|
|
49
49
|
});
|
|
50
|
-
const configLoaderResult = await processConfigLoaderResult({ configResult, dirPath, modelsSource });
|
|
50
|
+
const configLoaderResult = await processConfigLoaderResult({ configResult, dirPath, modelsSource, logger });
|
|
51
51
|
return {
|
|
52
52
|
...configLoaderResult,
|
|
53
53
|
stop: configResult.stop,
|
|
@@ -92,11 +92,11 @@ async function loadConfig({ dirPath, stackbitConfigESBuildOutDir, watchCallback,
|
|
|
92
92
|
errors: [rawConfigResult.error]
|
|
93
93
|
};
|
|
94
94
|
}
|
|
95
|
-
|
|
95
|
+
const validationResult = config_validator_1.validateBaseConfig(rawConfigResult.config);
|
|
96
96
|
const config = normalizeConfig(rawConfigResult.config);
|
|
97
97
|
return {
|
|
98
98
|
config: config,
|
|
99
|
-
errors:
|
|
99
|
+
errors: validationResult.errors
|
|
100
100
|
};
|
|
101
101
|
};
|
|
102
102
|
const rawConfigResult = await loadConfigFromDir({
|
|
@@ -118,7 +118,7 @@ async function loadConfig({ dirPath, stackbitConfigESBuildOutDir, watchCallback,
|
|
|
118
118
|
};
|
|
119
119
|
}
|
|
120
120
|
exports.loadConfig = loadConfig;
|
|
121
|
-
async function processConfigLoaderResult({ configResult, dirPath, modelsSource }) {
|
|
121
|
+
async function processConfigLoaderResult({ configResult, dirPath, modelsSource, logger }) {
|
|
122
122
|
const { config, errors: configLoadErrors } = configResult;
|
|
123
123
|
if (!config) {
|
|
124
124
|
return {
|
|
@@ -128,7 +128,9 @@ async function processConfigLoaderResult({ configResult, dirPath, modelsSource }
|
|
|
128
128
|
};
|
|
129
129
|
}
|
|
130
130
|
const { models: externalModels, errors: externalModelsLoadErrors } = await loadModelsFromExternalSource(config, dirPath, modelsSource);
|
|
131
|
-
const mergedModels =
|
|
131
|
+
const mergedModels = externalModels.length === 0
|
|
132
|
+
? config.models
|
|
133
|
+
: mergeConfigModelsWithExternalModels({ configModels: config.models, externalModels, logger });
|
|
132
134
|
const mergedConfig = {
|
|
133
135
|
...config,
|
|
134
136
|
models: mergedModels
|
|
@@ -151,7 +153,7 @@ async function processConfigLoaderResult({ configResult, dirPath, modelsSource }
|
|
|
151
153
|
};
|
|
152
154
|
}
|
|
153
155
|
async function loadAndMergeModelsFromFiles(config) {
|
|
154
|
-
const { models: modelsFromFiles, errors:
|
|
156
|
+
const { models: modelsFromFiles, errors: modelLoadErrors } = await config_loader_utils_1.loadYamlModelsFromFiles(config);
|
|
155
157
|
const { models: mergedModels, errors: mergeModelErrors } = config_loader_utils_1.mergeConfigModelsWithModelsFromFiles(config.models, modelsFromFiles);
|
|
156
158
|
const extendedConfig = {
|
|
157
159
|
...config,
|
|
@@ -159,7 +161,7 @@ async function loadAndMergeModelsFromFiles(config) {
|
|
|
159
161
|
};
|
|
160
162
|
return {
|
|
161
163
|
config: extendedConfig,
|
|
162
|
-
errors: [...
|
|
164
|
+
errors: [...modelLoadErrors, ...mergeModelErrors]
|
|
163
165
|
};
|
|
164
166
|
}
|
|
165
167
|
exports.loadAndMergeModelsFromFiles = loadAndMergeModelsFromFiles;
|
|
@@ -285,7 +287,7 @@ async function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCa
|
|
|
285
287
|
}
|
|
286
288
|
return {
|
|
287
289
|
config: null,
|
|
288
|
-
error: new config_errors_1.
|
|
290
|
+
error: new config_errors_1.StackbitConfigNotFoundError()
|
|
289
291
|
};
|
|
290
292
|
}
|
|
291
293
|
exports.loadConfigFromDir = loadConfigFromDir;
|
|
@@ -310,13 +312,13 @@ async function loadModelsFromExternalSource(config, dirPath, modelsSource) {
|
|
|
310
312
|
catch (error) {
|
|
311
313
|
return {
|
|
312
314
|
models: [],
|
|
313
|
-
errors: [new config_errors_1.
|
|
315
|
+
errors: [new config_errors_1.ModelLoadError(`Error fetching and converting Contentful schema, error: ${error.message}`, { originalError: error })]
|
|
314
316
|
};
|
|
315
317
|
}
|
|
316
318
|
}
|
|
317
319
|
return {
|
|
318
320
|
models: [],
|
|
319
|
-
errors: [new config_errors_1.
|
|
321
|
+
errors: [new config_errors_1.ModelLoadError(`modelsSource ${modelsSource} is unsupported`)]
|
|
320
322
|
};
|
|
321
323
|
}
|
|
322
324
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
@@ -347,11 +349,8 @@ async function loadConfigFromDotStackbit(dirPath) {
|
|
|
347
349
|
}
|
|
348
350
|
return lodash_1.default.isEmpty(config) ? null : config;
|
|
349
351
|
}
|
|
350
|
-
function mergeConfigModelsWithExternalModels({ configModels, externalModels }) {
|
|
352
|
+
function mergeConfigModelsWithExternalModels({ configModels, externalModels, logger }) {
|
|
351
353
|
var _a;
|
|
352
|
-
if (externalModels.length === 0) {
|
|
353
|
-
return configModels;
|
|
354
|
-
}
|
|
355
354
|
if (configModels.length === 0) {
|
|
356
355
|
return externalModels;
|
|
357
356
|
}
|
|
@@ -362,7 +361,18 @@ function mergeConfigModelsWithExternalModels({ configModels, externalModels }) {
|
|
|
362
361
|
continue;
|
|
363
362
|
}
|
|
364
363
|
const modelType = configModel.type ? (configModel.type === 'config' ? 'data' : configModel.type) : (_a = externalModel.type) !== null && _a !== void 0 ? _a : 'object';
|
|
365
|
-
let mergedModel = Object.assign({}, externalModel, lodash_1.default.pick(configModel, [
|
|
364
|
+
let mergedModel = Object.assign({}, externalModel, lodash_1.default.pick(configModel, [
|
|
365
|
+
'__metadata',
|
|
366
|
+
'urlPath',
|
|
367
|
+
'label',
|
|
368
|
+
'description',
|
|
369
|
+
'thumbnail',
|
|
370
|
+
'singleInstance',
|
|
371
|
+
'readOnly',
|
|
372
|
+
'labelField',
|
|
373
|
+
'fieldGroups',
|
|
374
|
+
'localized'
|
|
375
|
+
]), { type: modelType });
|
|
366
376
|
if (mergedModel.type === 'page' && !mergedModel.urlPath) {
|
|
367
377
|
mergedModel.urlPath = '/{slug}';
|
|
368
378
|
}
|
|
@@ -371,26 +381,52 @@ function mergeConfigModelsWithExternalModels({ configModels, externalModels }) {
|
|
|
371
381
|
if (!stackbitField) {
|
|
372
382
|
return externalField;
|
|
373
383
|
}
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
384
|
+
const FieldRemapMatrix = {
|
|
385
|
+
string: ['text', 'html', 'markdown', 'slug', 'url', 'color', 'date', 'datetime', 'enum', 'json', 'style'],
|
|
386
|
+
text: ['html', 'markdown', 'json', 'style'],
|
|
387
|
+
json: ['style']
|
|
388
|
+
};
|
|
389
|
+
// override field type if allowed, otherwise show a warning message
|
|
390
|
+
let fieldType = externalField.type;
|
|
391
|
+
const allowedOverrideTypes = FieldRemapMatrix[externalField.type];
|
|
392
|
+
if (stackbitField.type && stackbitField.type !== externalField.type) {
|
|
393
|
+
if (allowedOverrideTypes && allowedOverrideTypes.includes(stackbitField.type)) {
|
|
394
|
+
fieldType = stackbitField.type;
|
|
395
|
+
}
|
|
396
|
+
else {
|
|
397
|
+
logger === null || logger === void 0 ? void 0 : logger.warn(`Can't remap field of model '${mergedModel.name}' at path ${modelKeyPath}' ` +
|
|
398
|
+
`from ${externalField.type}' type to '${stackbitField.type}' type. ` +
|
|
399
|
+
`'${externalField.type}' fields can be only mapped to ` +
|
|
400
|
+
(!allowedOverrideTypes
|
|
401
|
+
? 'the same type.'
|
|
402
|
+
: allowedOverrideTypes.length === 1
|
|
403
|
+
? `'${allowedOverrideTypes[0]}' type`
|
|
404
|
+
: `one of [${allowedOverrideTypes.join(', ')}] types.`));
|
|
405
|
+
}
|
|
389
406
|
}
|
|
390
|
-
|
|
391
|
-
|
|
407
|
+
// add field specific properties
|
|
408
|
+
let fieldSpecificProps = {};
|
|
409
|
+
switch (fieldType) {
|
|
410
|
+
case 'number':
|
|
411
|
+
fieldSpecificProps = lodash_1.default.pick(stackbitField, ['subtype', 'min', 'max', 'step', 'unit']);
|
|
412
|
+
break;
|
|
413
|
+
case 'enum':
|
|
414
|
+
fieldSpecificProps = lodash_1.default.pick(stackbitField, ['options']);
|
|
415
|
+
break;
|
|
416
|
+
case 'style':
|
|
417
|
+
fieldSpecificProps = lodash_1.default.pick(stackbitField, ['styles']);
|
|
418
|
+
break;
|
|
419
|
+
case 'object':
|
|
420
|
+
fieldSpecificProps = lodash_1.default.pick(stackbitField, ['labelField', 'thumbnail', 'fieldGroups']);
|
|
421
|
+
break;
|
|
422
|
+
case 'model':
|
|
423
|
+
fieldSpecificProps = lodash_1.default.pick(stackbitField, ['models']);
|
|
424
|
+
break;
|
|
425
|
+
case 'reference':
|
|
426
|
+
fieldSpecificProps = lodash_1.default.pick(stackbitField, ['models']);
|
|
427
|
+
break;
|
|
392
428
|
}
|
|
393
|
-
return Object.assign({}, externalField, lodash_1.default.pick(stackbitField, ['label', 'description', 'required', 'default', 'group', 'const', 'hidden', 'readOnly', 'controlType']),
|
|
429
|
+
return Object.assign({}, externalField, lodash_1.default.pick(stackbitField, ['label', 'description', 'required', 'default', 'group', 'const', 'hidden', 'readOnly', 'controlType']), fieldSpecificProps, { type: fieldType });
|
|
394
430
|
});
|
|
395
431
|
mergedModelsByName[configModel.name] = mergedModel;
|
|
396
432
|
}
|