@sprucelabs/schema 32.3.1 → 32.3.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/build/SchemaTypesRenderer.d.ts +3 -1
- package/build/SchemaTypesRenderer.js +11 -4
- package/build/esm/SchemaTypesRenderer.d.ts +3 -1
- package/build/esm/SchemaTypesRenderer.js +11 -4
- package/build/esm/fields/SchemaField.js +11 -9
- package/build/fields/SchemaField.js +11 -9
- package/package.json +1 -1
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Schema } from './schemas.static.types';
|
|
2
|
-
import { TemplateLanguage } from './types/template.types';
|
|
2
|
+
import { SchemaTemplateItem, TemplateLanguage } from './types/template.types';
|
|
3
3
|
export default class SchemaTypesRenderer {
|
|
4
4
|
static Renderer(): SchemaTypesRenderer;
|
|
5
5
|
render(schema: Schema, options: {
|
|
6
6
|
language: TemplateLanguage;
|
|
7
|
+
schemaTemplateItems: SchemaTemplateItem[];
|
|
7
8
|
}): string;
|
|
9
|
+
private renderName;
|
|
8
10
|
private renderField;
|
|
9
11
|
private renderComment;
|
|
10
12
|
private ucFirst;
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const fields_1 = require("./fields");
|
|
7
|
+
const template_types_1 = require("./types/template.types");
|
|
7
8
|
const assertOptions_1 = __importDefault(require("./utilities/assertOptions"));
|
|
8
9
|
class SchemaTypesRenderer {
|
|
9
10
|
static Renderer() {
|
|
@@ -11,24 +12,30 @@ class SchemaTypesRenderer {
|
|
|
11
12
|
}
|
|
12
13
|
render(schema, options) {
|
|
13
14
|
(0, assertOptions_1.default)({ schema, options }, ['schema', 'options']);
|
|
14
|
-
const { id, fields } = schema;
|
|
15
|
-
const
|
|
15
|
+
const { id, fields, namespace } = schema;
|
|
16
|
+
const { schemaTemplateItems } = options;
|
|
17
|
+
const name = this.renderName(id, namespace);
|
|
16
18
|
const comment = this.renderComment(schema);
|
|
17
19
|
let body = '';
|
|
18
20
|
for (const [key, field] of Object.entries(fields ?? {})) {
|
|
19
|
-
let fieldLine = this.renderField(field, key);
|
|
21
|
+
let fieldLine = this.renderField(field, key, schemaTemplateItems);
|
|
20
22
|
body += fieldLine;
|
|
21
23
|
}
|
|
22
24
|
return `${comment ? `${comment}\n` : ''}type ${name} struct {
|
|
23
25
|
${body}}`;
|
|
24
26
|
}
|
|
25
|
-
|
|
27
|
+
renderName(id, namespace) {
|
|
28
|
+
return `${namespace ? `${namespace}` : ''}${this.ucFirst(id)}`;
|
|
29
|
+
}
|
|
30
|
+
renderField(field, key, schemaTemplateItems = []) {
|
|
26
31
|
const FieldClass = fields_1.fieldClassMap[field.type];
|
|
27
32
|
const { valueType, validation } = FieldClass.generateTemplateDetails({
|
|
28
33
|
//@ts-ignore
|
|
29
34
|
definition: field,
|
|
30
35
|
language: 'go',
|
|
31
36
|
importAs: 'SpruceSchema',
|
|
37
|
+
templateItems: schemaTemplateItems,
|
|
38
|
+
renderAs: template_types_1.TemplateRenderAs.Type,
|
|
32
39
|
});
|
|
33
40
|
const { hint, isRequired, minArrayLength, isArray } = field;
|
|
34
41
|
let fieldLine = '';
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Schema } from './schemas.static.types';
|
|
2
|
-
import { TemplateLanguage } from './types/template.types';
|
|
2
|
+
import { SchemaTemplateItem, TemplateLanguage } from './types/template.types';
|
|
3
3
|
export default class SchemaTypesRenderer {
|
|
4
4
|
static Renderer(): SchemaTypesRenderer;
|
|
5
5
|
render(schema: Schema, options: {
|
|
6
6
|
language: TemplateLanguage;
|
|
7
|
+
schemaTemplateItems: SchemaTemplateItem[];
|
|
7
8
|
}): string;
|
|
9
|
+
private renderName;
|
|
8
10
|
private renderField;
|
|
9
11
|
private renderComment;
|
|
10
12
|
private ucFirst;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { fieldClassMap } from './fields/index.js';
|
|
2
|
+
import { TemplateRenderAs, } from './types/template.types.js';
|
|
2
3
|
import assertOptions from './utilities/assertOptions.js';
|
|
3
4
|
export default class SchemaTypesRenderer {
|
|
4
5
|
static Renderer() {
|
|
@@ -6,24 +7,30 @@ export default class SchemaTypesRenderer {
|
|
|
6
7
|
}
|
|
7
8
|
render(schema, options) {
|
|
8
9
|
assertOptions({ schema, options }, ['schema', 'options']);
|
|
9
|
-
const { id, fields } = schema;
|
|
10
|
-
const
|
|
10
|
+
const { id, fields, namespace } = schema;
|
|
11
|
+
const { schemaTemplateItems } = options;
|
|
12
|
+
const name = this.renderName(id, namespace);
|
|
11
13
|
const comment = this.renderComment(schema);
|
|
12
14
|
let body = '';
|
|
13
15
|
for (const [key, field] of Object.entries(fields !== null && fields !== void 0 ? fields : {})) {
|
|
14
|
-
let fieldLine = this.renderField(field, key);
|
|
16
|
+
let fieldLine = this.renderField(field, key, schemaTemplateItems);
|
|
15
17
|
body += fieldLine;
|
|
16
18
|
}
|
|
17
19
|
return `${comment ? `${comment}\n` : ''}type ${name} struct {
|
|
18
20
|
${body}}`;
|
|
19
21
|
}
|
|
20
|
-
|
|
22
|
+
renderName(id, namespace) {
|
|
23
|
+
return `${namespace ? `${namespace}` : ''}${this.ucFirst(id)}`;
|
|
24
|
+
}
|
|
25
|
+
renderField(field, key, schemaTemplateItems = []) {
|
|
21
26
|
const FieldClass = fieldClassMap[field.type];
|
|
22
27
|
const { valueType, validation } = FieldClass.generateTemplateDetails({
|
|
23
28
|
//@ts-ignore
|
|
24
29
|
definition: field,
|
|
25
30
|
language: 'go',
|
|
26
31
|
importAs: 'SpruceSchema',
|
|
32
|
+
templateItems: schemaTemplateItems,
|
|
33
|
+
renderAs: TemplateRenderAs.Type,
|
|
27
34
|
});
|
|
28
35
|
const { hint, isRequired, minArrayLength, isArray } = field;
|
|
29
36
|
let fieldLine = '';
|
|
@@ -48,7 +48,7 @@ class SchemaField extends AbstractField {
|
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
static generateTemplateDetails(options) {
|
|
51
|
-
const { templateItems, renderAs, definition, globalNamespace } = options;
|
|
51
|
+
const { templateItems, renderAs, definition, globalNamespace, language, } = options;
|
|
52
52
|
const { typeSuffix = '' } = definition.options;
|
|
53
53
|
const idsWithVersion = SchemaField.mapFieldDefinitionToSchemaIdsWithVersion(definition);
|
|
54
54
|
const unions = [];
|
|
@@ -83,22 +83,24 @@ class SchemaField extends AbstractField {
|
|
|
83
83
|
}
|
|
84
84
|
if (matchedTemplateItem) {
|
|
85
85
|
let valueType;
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
86
|
+
const { namePascal, namespace, id, nameCamel, schema } = matchedTemplateItem;
|
|
87
|
+
if (language === 'go') {
|
|
88
|
+
valueType = `*${namespace}${namePascal}`;
|
|
89
|
+
}
|
|
90
|
+
else if (renderAs === TemplateRenderAs.Value) {
|
|
91
|
+
valueType = `${nameCamel}Schema${schema.version ? `_${schema.version}` : ''}`;
|
|
90
92
|
}
|
|
91
93
|
else {
|
|
92
|
-
valueType = `${globalNamespace}.${
|
|
93
|
-
? `.${
|
|
94
|
-
: `.${
|
|
94
|
+
valueType = `${globalNamespace}.${namespace}${version ? `.${version}` : ''}${renderAs === TemplateRenderAs.Type
|
|
95
|
+
? `.${namePascal + typeSuffix}`
|
|
96
|
+
: `.${namePascal}Schema`}`;
|
|
95
97
|
if (renderAs === TemplateRenderAs.Type &&
|
|
96
98
|
idsWithVersion.length > 1) {
|
|
97
99
|
valueType = `{ id: '${id}', values: ${valueType} }`;
|
|
98
100
|
}
|
|
99
101
|
}
|
|
100
102
|
unions.push({
|
|
101
|
-
schemaId:
|
|
103
|
+
schemaId: id,
|
|
102
104
|
valueType,
|
|
103
105
|
});
|
|
104
106
|
}
|
|
@@ -53,7 +53,7 @@ class SchemaField extends AbstractField_1.default {
|
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
55
|
static generateTemplateDetails(options) {
|
|
56
|
-
const { templateItems, renderAs, definition, globalNamespace } = options;
|
|
56
|
+
const { templateItems, renderAs, definition, globalNamespace, language, } = options;
|
|
57
57
|
const { typeSuffix = '' } = definition.options;
|
|
58
58
|
const idsWithVersion = SchemaField.mapFieldDefinitionToSchemaIdsWithVersion(definition);
|
|
59
59
|
const unions = [];
|
|
@@ -88,22 +88,24 @@ class SchemaField extends AbstractField_1.default {
|
|
|
88
88
|
}
|
|
89
89
|
if (matchedTemplateItem) {
|
|
90
90
|
let valueType;
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
91
|
+
const { namePascal, namespace, id, nameCamel, schema } = matchedTemplateItem;
|
|
92
|
+
if (language === 'go') {
|
|
93
|
+
valueType = `*${namespace}${namePascal}`;
|
|
94
|
+
}
|
|
95
|
+
else if (renderAs === template_types_1.TemplateRenderAs.Value) {
|
|
96
|
+
valueType = `${nameCamel}Schema${schema.version ? `_${schema.version}` : ''}`;
|
|
95
97
|
}
|
|
96
98
|
else {
|
|
97
|
-
valueType = `${globalNamespace}.${
|
|
98
|
-
? `.${
|
|
99
|
-
: `.${
|
|
99
|
+
valueType = `${globalNamespace}.${namespace}${version ? `.${version}` : ''}${renderAs === template_types_1.TemplateRenderAs.Type
|
|
100
|
+
? `.${namePascal + typeSuffix}`
|
|
101
|
+
: `.${namePascal}Schema`}`;
|
|
100
102
|
if (renderAs === template_types_1.TemplateRenderAs.Type &&
|
|
101
103
|
idsWithVersion.length > 1) {
|
|
102
104
|
valueType = `{ id: '${id}', values: ${valueType} }`;
|
|
103
105
|
}
|
|
104
106
|
}
|
|
105
107
|
unions.push({
|
|
106
|
-
schemaId:
|
|
108
|
+
schemaId: id,
|
|
107
109
|
valueType,
|
|
108
110
|
});
|
|
109
111
|
}
|