@stackbit/sdk 0.2.28 → 0.2.31

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.
Files changed (31) hide show
  1. package/dist/analyzer/analyze-schema-types.d.ts +3 -2
  2. package/dist/analyzer/analyze-schema-types.js.map +1 -1
  3. package/dist/analyzer/schema-generator.js +4 -1
  4. package/dist/analyzer/schema-generator.js.map +1 -1
  5. package/dist/config/config-loader.js +17 -20
  6. package/dist/config/config-loader.js.map +1 -1
  7. package/dist/config/config-schema.js +5 -0
  8. package/dist/config/config-schema.js.map +1 -1
  9. package/dist/config/config-types.d.ts +9 -3
  10. package/dist/consts.d.ts +1 -0
  11. package/dist/consts.js +2 -1
  12. package/dist/consts.js.map +1 -1
  13. package/dist/content/content-loader.js +1 -1
  14. package/dist/content/content-loader.js.map +1 -1
  15. package/dist/content/content-validator.js +5 -5
  16. package/dist/content/content-validator.js.map +1 -1
  17. package/dist/utils/model-iterators.d.ts +5 -0
  18. package/dist/utils/model-matcher.js +5 -5
  19. package/dist/utils/model-matcher.js.map +1 -1
  20. package/dist/utils/model-utils.d.ts +6 -1
  21. package/package.json +4 -3
  22. package/src/analyzer/analyze-schema-types.ts +3 -0
  23. package/src/analyzer/schema-generator.ts +4 -1
  24. package/src/config/config-loader.ts +20 -27
  25. package/src/config/config-schema.ts +6 -0
  26. package/src/config/config-types.ts +10 -3
  27. package/src/consts.ts +1 -0
  28. package/src/content/content-loader.ts +13 -6
  29. package/src/content/content-validator.ts +4 -4
  30. package/src/utils/model-matcher.ts +6 -6
  31. package/src/.DS_Store +0 -0
package/dist/consts.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  export declare const MARKDOWN_FILE_EXTENSIONS: string[];
2
2
  export declare const DATA_FILE_EXTENSIONS: string[];
3
+ export declare const SUPPORTED_FILE_EXTENSIONS: string[];
3
4
  export declare const EXCLUDED_MARKDOWN_FILES: string[];
4
5
  export declare const EXCLUDED_DATA_FILES: string[];
5
6
  export declare const EXCLUDED_COMMON_FILES: string[];
package/dist/consts.js CHANGED
@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.EXCLUDED_COMMON_FILES = exports.EXCLUDED_DATA_FILES = exports.EXCLUDED_MARKDOWN_FILES = exports.DATA_FILE_EXTENSIONS = exports.MARKDOWN_FILE_EXTENSIONS = void 0;
6
+ exports.EXCLUDED_COMMON_FILES = exports.EXCLUDED_DATA_FILES = exports.EXCLUDED_MARKDOWN_FILES = exports.SUPPORTED_FILE_EXTENSIONS = exports.DATA_FILE_EXTENSIONS = exports.MARKDOWN_FILE_EXTENSIONS = void 0;
7
7
  const lodash_1 = __importDefault(require("lodash"));
8
8
  const excludedMarkdownFiles = ['LICENSE.md', '**/README.md', 'README.theme.md', 'CONTRIBUTING.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md'];
9
9
  exports.MARKDOWN_FILE_EXTENSIONS = ['md', 'mdx', 'markdown'];
10
10
  exports.DATA_FILE_EXTENSIONS = ['yml', 'yaml', 'json', 'toml'];
11
+ exports.SUPPORTED_FILE_EXTENSIONS = [...exports.MARKDOWN_FILE_EXTENSIONS, ...exports.DATA_FILE_EXTENSIONS];
11
12
  exports.EXCLUDED_MARKDOWN_FILES = lodash_1.default.concat(excludedMarkdownFiles, excludedMarkdownFiles.map(lodash_1.default.toLower));
12
13
  exports.EXCLUDED_DATA_FILES = ['stackbit.yaml', 'netlify.toml', 'theme.toml', '**/package.json', '**/package-lock.json', '**/yarn-lock.json'];
13
14
  exports.EXCLUDED_COMMON_FILES = ['**/node_modules/**', '**/.git/**', '.idea/**', '**/.*'];
package/dist/consts.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,MAAM,qBAAqB,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,CAAC,CAAC;AAE5H,QAAA,wBAAwB,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AACrD,QAAA,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,uBAAuB,GAAG,gBAAC,CAAC,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,GAAG,CAAC,gBAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAChG,QAAA,mBAAmB,GAAG,CAAC,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,mBAAmB,CAAC,CAAC;AACtI,QAAA,qBAAqB,GAAG,CAAC,oBAAoB,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC"}
1
+ {"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,MAAM,qBAAqB,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,CAAC,CAAC;AAE5H,QAAA,wBAAwB,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AACrD,QAAA,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,yBAAyB,GAAG,CAAC,GAAG,gCAAwB,EAAE,GAAG,4BAAoB,CAAC,CAAC;AACnF,QAAA,uBAAuB,GAAG,gBAAC,CAAC,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,GAAG,CAAC,gBAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAChG,QAAA,mBAAmB,GAAG,CAAC,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,mBAAmB,CAAC,CAAC;AACtI,QAAA,qBAAqB,GAAG,CAAC,oBAAoB,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC"}
package/dist/content/content-loader.js CHANGED
@@ -116,7 +116,7 @@ async function loadPageFiles({ dirPath, config, skipUnmodeledContent }) {
116
116
  }
117
117
  let filePaths;
118
118
  try {
119
- filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, consts_1.MARKDOWN_FILE_EXTENSIONS);
119
+ filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, consts_1.SUPPORTED_FILE_EXTENSIONS);
120
120
  }
121
121
  catch (error) {
122
122
  return {
package/dist/content/content-loader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"content-loader.js","sourceRoot":"","sources":["../../src/content/content-loader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"content-loader.js","sourceRoot":"","sources":["../../src/content/content-loader.ts"],"names":[],"mappings":"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"}
package/dist/content/content-validator.js CHANGED
@@ -13,8 +13,8 @@ function validateContentItems({ contentItems, config }) {
13
13
  const errors = [];
14
14
  const joiModelSchemas = content_schema_1.joiSchemasForModels(config);
15
15
  const value = lodash_1.default.map(contentItems, (contentItem) => {
16
- var _a;
17
- const modelName = contentItem.__metadata.modelName;
16
+ var _a, _b;
17
+ const modelName = (_a = contentItem.__metadata) === null || _a === void 0 ? void 0 : _a.modelName;
18
18
  if (!modelName) {
19
19
  return contentItem;
20
20
  }
@@ -44,8 +44,8 @@ function validateContentItems({ contentItems, config }) {
44
44
  modelSchema = modelSchema.keys({ [pageLayoutKey]: joi_1.default.string().valid(model.layout) });
45
45
  }
46
46
  }
47
- else if (utils_1.isDataModel(model)) {
48
- const objectTypeKey = config.objectTypeKey || 'layout';
47
+ else if (utils_1.isDataModel(model) && !utils_1.isListDataModel(model)) {
48
+ const objectTypeKey = config.objectTypeKey || 'type';
49
49
  if (!lodash_1.default.find(model.fields, { name: objectTypeKey })) {
50
50
  modelSchema = modelSchema.keys({ [objectTypeKey]: joi_1.default.string().valid(model.name) });
51
51
  }
@@ -58,7 +58,7 @@ function validateContentItems({ contentItems, config }) {
58
58
  });
59
59
  }
60
60
  const validationResult = modelSchema.validate(contentItem, validationOptions);
61
- const validationErrors = (_a = validationResult.error) === null || _a === void 0 ? void 0 : _a.details.map((validationError) => {
61
+ const validationErrors = (_b = validationResult.error) === null || _b === void 0 ? void 0 : _b.details.map((validationError) => {
62
62
  var _a;
63
63
  return new content_errors_1.ContentValidationError({
64
64
  type: validationError.type,
package/dist/content/content-validator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"content-validator.js","sourceRoot":"","sources":["../../src/content/content-validator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"content-validator.js","sourceRoot":"","sources":["../../src/content/content-validator.ts"],"names":[],"mappings":"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"}
package/dist/utils/model-iterators.d.ts CHANGED
@@ -48,21 +48,25 @@ export declare function mapModelFieldsRecursively(model: Model, iteratee: (field
48
48
  layout?: undefined;
49
49
  urlPath?: undefined;
50
50
  hideContent?: undefined;
51
+ source?: undefined;
51
52
  }) | (import("../config/config-types").BaseDataModelFields & {
52
53
  items?: undefined;
53
54
  } & import("../config/config-types").BaseModel & {
54
55
  layout?: undefined;
55
56
  urlPath?: undefined;
56
57
  hideContent?: undefined;
58
+ source?: undefined;
57
59
  }) | (import("../config/config-types").BaseDataModeList & {
58
60
  fields?: undefined;
59
61
  } & import("../config/config-types").BaseModel & {
60
62
  layout?: undefined;
61
63
  urlPath?: undefined;
62
64
  hideContent?: undefined;
65
+ source?: undefined;
63
66
  }) | (import("../config/config-types").YamlPageModel & import("../config/config-types").BaseModel & {
64
67
  isList?: undefined;
65
68
  items?: undefined;
69
+ source?: undefined;
66
70
  }) | (import("../config/config-types").YamlConfigModel & import("../config/config-types").BaseModel & {
67
71
  isList?: undefined;
68
72
  filePath?: undefined;
@@ -74,6 +78,7 @@ export declare function mapModelFieldsRecursively(model: Model, iteratee: (field
74
78
  layout?: undefined;
75
79
  urlPath?: undefined;
76
80
  hideContent?: undefined;
81
+ source?: undefined;
77
82
  }) | (import("../config/config-types").ImageModel & {
78
83
  file?: undefined;
79
84
  isList?: undefined;
package/dist/utils/model-matcher.js CHANGED
@@ -61,7 +61,7 @@ function getModelsByQuery(query, models) {
61
61
  modelGroups.byFile.push(model);
62
62
  }
63
63
  else if (objectType && lodash_1.default.has(model, modelTypeKeyPath)) {
64
- modelGroups.byLayout.push(model);
64
+ modelGroups.byType.push(model);
65
65
  }
66
66
  else {
67
67
  modelGroups.byGlob.push(model);
@@ -69,7 +69,7 @@ function getModelsByQuery(query, models) {
69
69
  return modelGroups;
70
70
  }, {
71
71
  byFile: [],
72
- byLayout: [],
72
+ byType: [],
73
73
  byGlob: []
74
74
  });
75
75
  const fileMatchedModels = lodash_1.default.filter(modelMatchGroups.byFile, (model) => {
@@ -86,12 +86,12 @@ function getModelsByQuery(query, models) {
86
86
  if (!lodash_1.default.isEmpty(fileMatchedModels)) {
87
87
  return fileMatchedModels;
88
88
  }
89
- const layoutMatchedModels = lodash_1.default.filter(modelMatchGroups.byLayout, (model) => {
89
+ const typeMatchedModels = lodash_1.default.filter(modelMatchGroups.byType, (model) => {
90
90
  const modelType = lodash_1.default.get(model, modelTypeKeyPath);
91
91
  return objectType === modelType;
92
92
  });
93
- if (!lodash_1.default.isEmpty(layoutMatchedModels)) {
94
- return layoutMatchedModels;
93
+ if (!lodash_1.default.isEmpty(typeMatchedModels)) {
94
+ return typeMatchedModels;
95
95
  }
96
96
  return lodash_1.default.filter(modelMatchGroups.byGlob, (model) => {
97
97
  const folder = lodash_1.default.get(model, 'folder', '');
package/dist/utils/model-matcher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model-matcher.js","sourceRoot":"","sources":["../../src/utils/model-matcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-matcher.js","sourceRoot":"","sources":["../../src/utils/model-matcher.ts"],"names":[],"mappings":"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"}
package/dist/utils/model-utils.d.ts CHANGED
@@ -62,21 +62,25 @@ export declare function getModelFieldForModelKeyPath(model: Model, modelKeyPath:
62
62
  layout?: undefined;
63
63
  urlPath?: undefined;
64
64
  hideContent?: undefined;
65
+ source?: undefined;
65
66
  }) | (import("../config/config-types").BaseDataModelFields & {
66
67
  items?: undefined;
67
68
  } & import("../config/config-types").BaseModel & {
68
69
  layout?: undefined;
69
70
  urlPath?: undefined;
70
71
  hideContent?: undefined;
72
+ source?: undefined;
71
73
  }) | (import("../config/config-types").BaseDataModeList & {
72
74
  fields?: undefined;
73
75
  } & import("../config/config-types").BaseModel & {
74
76
  layout?: undefined;
75
77
  urlPath?: undefined;
76
78
  hideContent?: undefined;
79
+ source?: undefined;
77
80
  }) | (import("../config/config-types").YamlPageModel & import("../config/config-types").BaseModel & {
78
81
  isList?: undefined;
79
82
  items?: undefined;
83
+ source?: undefined;
80
84
  }) | (import("../config/config-types").YamlConfigModel & import("../config/config-types").BaseModel & {
81
85
  isList?: undefined;
82
86
  filePath?: undefined;
@@ -88,4 +92,5 @@ export declare function getModelFieldForModelKeyPath(model: Model, modelKeyPath:
88
92
  layout?: undefined;
89
93
  urlPath?: undefined;
90
94
  hideContent?: undefined;
91
- }) | import("../config/config-types").FieldSimpleProps | import("../config/config-types").FieldEnumDropdownProps | import("../config/config-types").FieldEnumThumbnailsProps | import("../config/config-types").FieldEnumPaletteProps | import("../config/config-types").FieldNumberProps | FieldObjectProps | FieldModelProps | FieldReferenceProps | import("../config/config-types").FieldStyle | FieldList | null;
95
+ source?: undefined;
96
+ }) | import("../config/config-types").FieldSimpleProps | import("../config/config-types").FieldEnumDropdownProps | import("../config/config-types").FieldEnumThumbnailsProps | import("../config/config-types").FieldEnumPaletteProps | import("../config/config-types").FieldImageProps | import("../config/config-types").FieldNumberProps | FieldObjectProps | FieldModelProps | FieldReferenceProps | import("../config/config-types").FieldStyle | FieldList | null;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@stackbit/sdk",
3
- "version": "0.2.28",
3
+ "version": "0.2.31",
4
4
  "description": "Stackbit SDK",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -37,7 +37,7 @@
37
37
  "homepage": "https://github.com/stackbit/stackbit-sdk#readme",
38
38
  "dependencies": {
39
39
  "@octokit/rest": "^18.3.5",
40
- "@stackbit/utils": "^0.2.2",
40
+ "@stackbit/utils": "^0.2.3",
41
41
  "acorn": "^8.2.4",
42
42
  "fs-extra": "^9.1.0",
43
43
  "joi": "^17.4.0",
@@ -63,5 +63,6 @@
63
63
  "prettier": "2.2.1",
64
64
  "ts-jest": "^26.5.1",
65
65
  "typescript": "^4.2.2"
66
- }
66
+ },
67
+ "gitHead": "d7f4892da90ebfbf43cb58532d9ba442ae16b5e4"
67
68
  }
package/src/analyzer/analyze-schema-types.ts CHANGED
@@ -9,6 +9,7 @@ import {
9
9
  FieldType,
10
10
  FieldSimpleProps,
11
11
  FieldEnumProps,
12
+ FieldImageProps,
12
13
  FieldNumberProps,
13
14
  FieldObjectProps,
14
15
  FieldModelProps,
@@ -21,6 +22,7 @@ export type FieldWithUnknown =
21
22
  | FieldUnknown
22
23
  | FieldSimpleWithUnknown
23
24
  | FieldEnumWithUnknown
25
+ | FieldImageWithUnknown
24
26
  | FieldNumberWithUnknown
25
27
  | FieldObjectWithUnknown
26
28
  | FieldModelWithUnknown
@@ -30,6 +32,7 @@ export type FieldWithUnknown =
30
32
  export type FieldUnknown = FieldCommonPropsWithUnknown & FieldUnknownProps;
31
33
  export type FieldSimpleWithUnknown = FieldCommonPropsWithUnknown & FieldSimpleProps;
32
34
  export type FieldEnumWithUnknown = FieldCommonPropsWithUnknown & FieldEnumProps;
35
+ export type FieldImageWithUnknown = FieldCommonPropsWithUnknown & FieldImageProps;
33
36
  export type FieldNumberWithUnknown = FieldCommonPropsWithUnknown & FieldNumberProps;
34
37
  export type FieldObjectWithUnknown = FieldCommonPropsWithUnknown & FieldObjectPropsWithUnknown;
35
38
  export type FieldModelWithUnknown = FieldCommonPropsWithUnknown & FieldModelProps;
package/src/analyzer/schema-generator.ts CHANGED
@@ -574,7 +574,10 @@ function generateFieldListItems(
574
574
  // array will be marked as 'unknown'
575
575
  return null;
576
576
  } else if (_.isString(value)) {
577
- items = fieldFromStringValue(value);
577
+ return {
578
+ items: fieldFromStringValue(value),
579
+ objectModels
580
+ };
578
581
  } else if (_.isDate(value)) {
579
582
  // @iarna/toml returns date objects
580
583
  items = {
package/src/config/config-loader.ts CHANGED
@@ -25,7 +25,7 @@ import {
25
25
  normalizeListFieldInPlace,
26
26
  getModelFieldForModelKeyPath
27
27
  } from '../utils';
28
- import { append, omitByNil, parseFile, readDirRecursively, reducePromise, rename } from '@stackbit/utils';
28
+ import { append, prepend, omitByNil, parseFile, readDirRecursively, reducePromise, rename } from '@stackbit/utils';
29
29
  import { Config, DataModel, FieldEnum, FieldModel, FieldObjectProps, Model, ModelsSource, PageModel, YamlModel } from './config-types';
30
30
  import { loadPresets } from './presets-loader';
31
31
 
@@ -125,7 +125,7 @@ async function loadConfigFromDir(dirPath: string): Promise<TempConfigLoaderResul
125
125
  },
126
126
  errors: fileModelsErrors
127
127
  };
128
- } catch (error) {
128
+ } catch (error: any) {
129
129
  return {
130
130
  errors: [new ConfigLoadError(`Error loading Stackbit configuration: ${error.message}`, { originalError: error })]
131
131
  };
@@ -236,7 +236,7 @@ async function loadModelsFromExternalSource(
236
236
  models: models,
237
237
  errors: []
238
238
  };
239
- } catch (error) {
239
+ } catch (error: any) {
240
240
  return {
241
241
  models: [],
242
242
  errors: [new ConfigLoadError(`Error fetching and converting Contentful schema, error: ${error.message}`, { originalError: error })]
@@ -398,7 +398,6 @@ function normalizeConfig(config: any): any {
398
398
  const isStackbitYamlV2 = ver ? semver.satisfies(ver, '<0.3.0') : false;
399
399
  const models = config?.models || {};
400
400
  const gitCMS = isGitCMS(config);
401
- let referencedModelNames: string[] = [];
402
401
 
403
402
  _.forEach(models, (model, modelName) => {
404
403
  if (!model) {
@@ -427,14 +426,22 @@ function normalizeConfig(config: any): any {
427
426
  if (gitCMS) {
428
427
  updatePageFilePath(model, config);
429
428
  addMarkdownContentField(model);
430
-
431
- // TODO: update schema-editor to not show layout field
432
- addLayoutFieldToPageModel(model, pageLayoutKey);
433
429
  }
434
430
  } else if (isDataModel(model) && gitCMS) {
435
431
  updateDataFilePath(model, config);
436
432
  }
437
433
 
434
+ if (gitCMS) {
435
+ // TODO: do not add pageLayoutKey and objectTypeKey fields to models,
436
+ // The content validator should always assume these fields.
437
+ // And when new objects created from UI, it should add these fields automatically.
438
+ if (isPageModel(model)) {
439
+ addLayoutFieldToPageModel(model, pageLayoutKey, modelName);
440
+ } else if (isDataModel(model) && !isListDataModel(model)) {
441
+ addObjectTypeKeyField(model, objectTypeKey, modelName);
442
+ }
443
+ }
444
+
438
445
  if (isListDataModel(model)) {
439
446
  // 'items.type' of list model defaults to 'string', set it explicitly
440
447
  if (!_.has(model, 'items.type')) {
@@ -488,26 +495,9 @@ function normalizeConfig(config: any): any {
488
495
  field.models = _.get(field, 'models', []);
489
496
  }
490
497
  }
491
-
492
- if (gitCMS) {
493
- referencedModelNames = _.union(referencedModelNames, getReferencedModelNames(field));
494
- }
495
498
  });
496
499
  });
497
500
 
498
- _.forEach(referencedModelNames, (modelName) => {
499
- const model = models[modelName];
500
- // don't add objectTypeKey to page models, they have pageLayoutKey
501
- if (!model || model.type === 'page') {
502
- return;
503
- }
504
-
505
- // TODO: update schema-editor to not show type field
506
- // TODO: do not add objectTypeKey field to models, API/container should
507
- // be able to add it automatically when data object or polymorphic nested model is added
508
- addObjectTypeKeyField(model, objectTypeKey, modelName);
509
- });
510
-
511
501
  return config;
512
502
  }
513
503
 
@@ -574,7 +564,10 @@ function addMarkdownContentField(model: PageModel) {
574
564
  });
575
565
  }
576
566
 
577
- function addLayoutFieldToPageModel(model: any, pageLayoutKey: any) {
567
+ function addLayoutFieldToPageModel(model: any, pageLayoutKey: any, modelName: string) {
568
+ if (_.intersection(_.keys(model), ['file', 'folder', 'match', 'exclude']).length === 0 && !_.get(model, 'layout')) {
569
+ model.layout = modelName;
570
+ }
578
571
  const modelLayout = _.get(model, 'layout');
579
572
  if (!modelLayout) {
580
573
  return;
@@ -583,7 +576,7 @@ function addLayoutFieldToPageModel(model: any, pageLayoutKey: any) {
583
576
  if (hasLayoutField) {
584
577
  return;
585
578
  }
586
- append(model, 'fields', {
579
+ prepend(model, 'fields', {
587
580
  type: 'string',
588
581
  name: pageLayoutKey,
589
582
  label: _.startCase(pageLayoutKey),
@@ -597,7 +590,7 @@ function addObjectTypeKeyField(model: any, objectTypeKey: string, modelName: str
597
590
  if (hasObjectTypeField) {
598
591
  return;
599
592
  }
600
- append(model, 'fields', {
593
+ prepend(model, 'fields', {
601
594
  type: 'string',
602
595
  name: objectTypeKey,
603
596
  label: 'Object Type',
package/src/config/config-schema.ts CHANGED
@@ -357,6 +357,10 @@ const enumFieldBaseOptionSchema = Joi.object({
357
357
  value: Joi.alternatives().try(Joi.string(), Joi.number()).required()
358
358
  });
359
359
 
360
+ const imageFieldPartialSchema = Joi.object({
361
+ source: Joi.string()
362
+ });
363
+
360
364
  const enumFieldPartialSchema = Joi.object({
361
365
  type: Joi.string().valid('enum').required(),
362
366
  controlType: Joi.string().valid('dropdown', 'button-group', 'thumbnails', 'palette'),
@@ -430,6 +434,7 @@ const listItemsSchema = Joi.object({
430
434
  switch: [
431
435
  { is: 'number', then: numberFieldPartialSchema },
432
436
  { is: 'enum', then: enumFieldPartialSchema },
437
+ { is: 'image', then: imageFieldPartialSchema },
433
438
  { is: 'object', then: objectFieldPartialSchema },
434
439
  { is: 'model', then: modelFieldPartialSchema },
435
440
  { is: 'reference', then: referenceFieldPartialSchema }
@@ -445,6 +450,7 @@ const fieldSchema: Joi.ObjectSchema<Field> = fieldCommonPropsSchema.when('.type'
445
450
  switch: [
446
451
  { is: 'number', then: numberFieldPartialSchema },
447
452
  { is: 'enum', then: enumFieldPartialSchema },
453
+ { is: 'image', then: imageFieldPartialSchema },
448
454
  { is: 'object', then: objectFieldPartialSchema },
449
455
  { is: 'model', then: modelFieldPartialSchema },
450
456
  { is: 'reference', then: referenceFieldPartialSchema },
package/src/config/config-types.ts CHANGED
@@ -195,16 +195,18 @@ export interface ImageModel {
195
195
  label?: string;
196
196
  labelField?: string;
197
197
  fields?: Field[];
198
+ source?: string;
198
199
  }
199
200
 
200
201
  /*******************
201
202
  *** Field Types ***
202
203
  *******************/
203
204
 
204
- export type Field = FieldSimple | FieldEnum | FieldNumber | FieldObject | FieldModel | FieldReference | FieldStyle | FieldList;
205
+ export type Field = FieldSimple | FieldEnum | FieldImage | FieldNumber | FieldObject | FieldModel | FieldReference | FieldStyle | FieldList;
205
206
 
206
207
  export type FieldSimple = FieldCommonProps & FieldSimpleProps;
207
208
  export type FieldEnum = FieldCommonProps & FieldEnumProps;
209
+ export type FieldImage = FieldCommonProps & FieldImageProps;
208
210
  export type FieldNumber = FieldCommonProps & FieldNumberProps;
209
211
  export type FieldObject = FieldCommonProps & FieldObjectProps;
210
212
  export type FieldModel = FieldCommonProps & FieldModelProps;
@@ -232,7 +234,7 @@ export interface FieldCommonProps {
232
234
  export type FieldType = typeof FIELD_TYPES[number];
233
235
 
234
236
  export interface FieldSimpleProps {
235
- type: 'string' | 'url' | 'slug' | 'text' | 'markdown' | 'html' | 'boolean' | 'date' | 'datetime' | 'color' | 'image' | 'file' | 'json' | 'richText';
237
+ type: 'string' | 'url' | 'slug' | 'text' | 'markdown' | 'html' | 'boolean' | 'date' | 'datetime' | 'color' | 'file' | 'json' | 'richText';
236
238
  }
237
239
 
238
240
  export type FieldEnumProps = FieldEnumDropdownProps | FieldEnumThumbnailsProps | FieldEnumPaletteProps;
@@ -272,6 +274,11 @@ export interface FieldEnumOptionPalette extends FieldEnumOptionObject {
272
274
  borderColor?: string;
273
275
  }
274
276
 
277
+ export interface FieldImageProps {
278
+ type: 'image';
279
+ source?: string;
280
+ }
281
+
275
282
  export interface FieldNumberProps {
276
283
  type: 'number';
277
284
  controlType?: 'slider';
@@ -315,4 +322,4 @@ export interface FieldListProps {
315
322
  items?: FieldListItems;
316
323
  }
317
324
 
318
- export type FieldListItems = FieldSimpleProps | FieldEnumProps | FieldNumberProps | FieldObjectProps | FieldModelProps | FieldReferenceProps;
325
+ export type FieldListItems = FieldSimpleProps | FieldEnumProps | FieldImageProps | FieldNumberProps | FieldObjectProps | FieldModelProps | FieldReferenceProps;
package/src/consts.ts CHANGED
@@ -4,6 +4,7 @@ const excludedMarkdownFiles = ['LICENSE.md', '**/README.md', 'README.theme.md',
4
4
 
5
5
  export const MARKDOWN_FILE_EXTENSIONS = ['md', 'mdx', 'markdown'];
6
6
  export const DATA_FILE_EXTENSIONS = ['yml', 'yaml', 'json', 'toml'];
7
+ export const SUPPORTED_FILE_EXTENSIONS = [...MARKDOWN_FILE_EXTENSIONS, ...DATA_FILE_EXTENSIONS];
7
8
  export const EXCLUDED_MARKDOWN_FILES = _.concat(excludedMarkdownFiles, excludedMarkdownFiles.map(_.toLower));
8
9
  export const EXCLUDED_DATA_FILES = ['stackbit.yaml', 'netlify.toml', 'theme.toml', '**/package.json', '**/package-lock.json', '**/yarn-lock.json'];
9
10
  export const EXCLUDED_COMMON_FILES = ['**/node_modules/**', '**/.git/**', '.idea/**', '**/.*'];
package/src/content/content-loader.ts CHANGED
@@ -18,7 +18,14 @@ import {
18
18
  getModelOfObject
19
19
  } from '../utils';
20
20
  import { validateContentItems } from './content-validator';
21
- import { DATA_FILE_EXTENSIONS, EXCLUDED_DATA_FILES, EXCLUDED_MARKDOWN_FILES, EXCLUDED_COMMON_FILES, MARKDOWN_FILE_EXTENSIONS } from '../consts';
21
+ import {
22
+ DATA_FILE_EXTENSIONS,
23
+ EXCLUDED_DATA_FILES,
24
+ EXCLUDED_MARKDOWN_FILES,
25
+ EXCLUDED_COMMON_FILES,
26
+ MARKDOWN_FILE_EXTENSIONS,
27
+ SUPPORTED_FILE_EXTENSIONS
28
+ } from '../consts';
22
29
  import { Config, ConfigModel, Field, FieldListItems, FieldModelProps, Model } from '../config/config-types';
23
30
 
24
31
  interface BaseMetadata {
@@ -132,7 +139,7 @@ async function loadDataFiles({ dirPath, config, skipUnmodeledContent }: ContentL
132
139
  let filePaths;
133
140
  try {
134
141
  filePaths = await readDirRecursivelyWithFilter(absDataDirPath, excludedFiles, DATA_FILE_EXTENSIONS);
135
- } catch (error) {
142
+ } catch (error: any) {
136
143
  return {
137
144
  contentItems,
138
145
  errors: errors.concat(new FolderReadError({ folderPath: dataDir, error: error }))
@@ -185,8 +192,8 @@ async function loadPageFiles({ dirPath, config, skipUnmodeledContent }: ContentL
185
192
 
186
193
  let filePaths;
187
194
  try {
188
- filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, MARKDOWN_FILE_EXTENSIONS);
189
- } catch (error) {
195
+ filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, SUPPORTED_FILE_EXTENSIONS);
196
+ } catch (error: any) {
190
197
  return {
191
198
  contentItems,
192
199
  errors: errors.concat(new FolderReadError({ folderPath: pagesDir, error: error }))
@@ -237,7 +244,7 @@ async function loadDataItemForConfigModel(dirPath: string, configModel: ConfigMo
237
244
  return {
238
245
  contentItem: modeledDataItem(filePath, data, configModel, config)
239
246
  };
240
- } catch (error) {
247
+ } catch (error: any) {
241
248
  return {
242
249
  error: new FileReadError({ filePath: filePath, error: error })
243
250
  };
@@ -305,7 +312,7 @@ async function loadContentItems({
305
312
  let data;
306
313
  try {
307
314
  data = await loadFile(absFilePath, fileIsInProjectDir);
308
- } catch (error) {
315
+ } catch (error: any) {
309
316
  errors.push(new FileReadError({ filePath: filePathRelativeToProject, error: error }));
310
317
  return;
311
318
  }
package/src/content/content-validator.ts CHANGED
@@ -4,7 +4,7 @@ import _ from 'lodash';
4
4
  import { ContentItem } from './content-loader';
5
5
  import { joiSchemasForModels } from './content-schema';
6
6
  import { ContentValidationError } from './content-errors';
7
- import { getModelByName, isConfigModel, isDataModel, isPageModel } from '../utils';
7
+ import { getModelByName, isConfigModel, isDataModel, isListDataModel, isPageModel } from '../utils';
8
8
  import { Config } from '../config/config-types';
9
9
 
10
10
  interface ContentValidationOptions {
@@ -26,7 +26,7 @@ export function validateContentItems({ contentItems, config }: ContentValidation
26
26
  const value = _.map(
27
27
  contentItems,
28
28
  (contentItem): ContentItem => {
29
- const modelName = contentItem.__metadata.modelName;
29
+ const modelName = contentItem.__metadata?.modelName;
30
30
  if (!modelName) {
31
31
  return contentItem;
32
32
  }
@@ -55,8 +55,8 @@ export function validateContentItems({ contentItems, config }: ContentValidation
55
55
  if (!_.find(model.fields, { name: pageLayoutKey })) {
56
56
  modelSchema = modelSchema.keys({ [pageLayoutKey]: Joi.string().valid(model.layout) });
57
57
  }
58
- } else if (isDataModel(model)) {
59
- const objectTypeKey = config.objectTypeKey || 'layout';
58
+ } else if (isDataModel(model) && !isListDataModel(model)) {
59
+ const objectTypeKey = config.objectTypeKey || 'type';
60
60
  if (!_.find(model.fields, { name: objectTypeKey })) {
61
61
  modelSchema = modelSchema.keys({ [objectTypeKey]: Joi.string().valid(model.name) });
62
62
  }